From d246e1300edb53b34f5eacdaff31886300c2f7d4 Mon Sep 17 00:00:00 2001 From: dbs Date: Fri, 6 Feb 2009 18:45:34 +0000 Subject: [PATCH] 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 --- src/javascript/DojoSRF.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/javascript/DojoSRF.js b/src/javascript/DojoSRF.js index e02ac98..aa06c6b 100644 --- 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(); } } -- 2.11.0