[Opensrf-commits] r1656 - branches/rel_1_0/src/javascript (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2009-02-06 13:45:34 -0500 (Fri, 06 Feb 2009)
New Revision: 1656

Modified:
   branches/rel_1_0/src/javascript/DojoSRF.js
Log:
Merge r1652:1654 from trunk to squash locale-handling problem


Modified: branches/rel_1_0/src/javascript/DojoSRF.js
===================================================================
--- branches/rel_1_0/src/javascript/DojoSRF.js	2009-02-06 18:41:27 UTC (rev 1655)
+++ branches/rel_1_0/src/javascript/DojoSRF.js	2009-02-06 18:45:34 UTC (rev 1656)
@@ -18,7 +18,7 @@
 	}
 
         localeRE = /^(\w\w)(-\w\w)?$/;
-        localeMatch = localeRE.exec(dojo.config.locale);
+        localeMatch = localeRE.exec(dojo.locale);
 
         if (!localeMatch[1]) {
                 OpenSRF.locale = dojo.isIE ? navigator.userLanguage : navigator.language;
@@ -26,6 +26,6 @@
                 OpenSRF.locale = localeMatch[1].toLowerCase();
         }
         if (localeMatch[2]) {
-                OpenSRF.locale = OpenSRF.locale + '-' + localeMatch[2].toUpperCase();
+                OpenSRF.locale = OpenSRF.locale + localeMatch[2].toUpperCase();
         }
 }