From b1352187893b273cf60ee9f251aaa0e27ac7d9ba Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 6 Aug 2012 10:59:18 +0200 Subject: [PATCH] BUG Detect JS lang by , and force init --- javascript/i18n.js | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/javascript/i18n.js b/javascript/i18n.js index 6701ae68d..e039e9657 100644 --- a/javascript/i18n.js +++ b/javascript/i18n.js @@ -22,9 +22,14 @@ ss.i18n = { defaultLocale: 'en_US', lang: {}, + + inited: false, init: function() { + if(this.inited) return; + this.currentLocale = this.detectLocale(); + this.inited = true; }, /** @@ -59,6 +64,8 @@ ss.i18n = { * */ _t: function (entity, fallbackString, priority, context) { + this.init(); + if (this.lang && this.lang[this.getLocale()] && this.lang[this.getLocale()][entity]) { return this.lang[this.getLocale()][entity]; } else if (this.lang && this.lang[this.defaultLocale] && this.lang[this.defaultLocale][entity]) { @@ -165,15 +172,20 @@ ss.i18n = { detectLocale: function() { var rawLocale; var detectedLocale; + + // get by container tag + rawLocale = jQuery('body').attr('lang'); // get by meta - var metas = document.getElementsByTagName('meta'); - for(var i=0; i