Merge r1652:1654 from trunk to squash locale-handling problem

git-svn-id: svn://svn.open-ils.org/OpenSRF/branches/rel_1_0@1656 9efc2488-bf62-4759-914b-345cdb29e865

diff --git a/src/javascript/DojoSRF.js b/src/javascript/DojoSRF.js
index e02ac98..aa06c6b 100644 (file)
--- a/src/javascript/DojoSRF.js
+++ b/src/javascript/DojoSRF.js
@@ -18,7 +18,7 @@ if(!dojo._hasResource['DojoSRF']){
        }
 
         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 @@ if(!dojo._hasResource['DojoSRF']){
                 OpenSRF.locale = localeMatch[1].toLowerCase();
         }
         if (localeMatch[2]) {
-                OpenSRF.locale = OpenSRF.locale + '-' + localeMatch[2].toUpperCase();
+                OpenSRF.locale = OpenSRF.locale + localeMatch[2].toUpperCase();
         }
 }