[fusion-commits] r1640 - trunk/lib

[svn_fusion at osgeo.org]

Author: madair
Date: 2008-11-05 14:02:44 -0500 (Wed, 05 Nov 2008)
New Revision: 1640

Modified:
   trunk/lib/fusion.js
Log:
closes #150: bring Fusion in line with OpenLayers.Lang 

Modified: trunk/lib/fusion.js
===================================================================
--- trunk/lib/fusion.js	2008-11-05 16:39:49 UTC (rev 1639)
+++ trunk/lib/fusion.js	2008-11-05 19:02:44 UTC (rev 1640)
@@ -282,15 +282,15 @@
         },
 
         initializeLocale: function(locale) {
-          this.locale = locale ? locale : window._FusionLocale;
-          OpenLayers.Lang.setCode(this.locale);
+          OpenLayers.Lang.setCode(locale ? locale : window._FusionLocale);
+          this.locale = OpenLayers.Lang.code;
 
           //check if strings are defined for specified locale, if not, set them to the default locale
           if (!OpenLayers.Lang[this.locale]) {
-            OpenLayers.Lang[this.locale] = OpenLayers.Lang[OpenLayers.String.defaultLangCode];
+            OpenLayers.Lang[this.locale] = OpenLayers.Lang[OpenLayers.Lang.defaultCode];
           }
           if (!Fusion.Strings[this.locale]) {
-            Fusion.Strings[this.locale] = Fusion.Strings[OpenLayers.String.defaultLangCode];
+            Fusion.Strings[this.locale] = Fusion.Strings[OpenLayers.Lang.defaultCode];
           }
           OpenLayers.Util.extend(OpenLayers.Lang[this.locale], Fusion.Strings[this.locale]);
         },