From: dbs Date: Wed, 4 Feb 2009 03:57:04 +0000 (+0000) Subject: Backport r1651 from trunk - munge locale case for OpenSRF. X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=eb87c6505c58c97029f0bcb07bdf573ee9cf0fef;p=OpenSRF.git Backport r1651 from trunk - munge locale case for OpenSRF. git-svn-id: svn://svn.open-ils.org/OpenSRF/branches/rel_1_0@1652 9efc2488-bf62-4759-914b-345cdb29e865 --- diff --git a/src/javascript/DojoSRF.js b/src/javascript/DojoSRF.js index 6b52594..e02ac98 100644 --- a/src/javascript/DojoSRF.js +++ b/src/javascript/DojoSRF.js @@ -17,8 +17,15 @@ if(!dojo._hasResource['DojoSRF']){ return this.session_cache[app]; } - OpenSRF.locale = dojo.config.locale; - if (!OpenSRF.locale) { - OpenSRF.locale = dojo.isIE ? navigator.userLanguage : navigator.language; - } + localeRE = /^(\w\w)(-\w\w)?$/; + localeMatch = localeRE.exec(dojo.config.locale); + + if (!localeMatch[1]) { + OpenSRF.locale = dojo.isIE ? navigator.userLanguage : navigator.language; + } else { + OpenSRF.locale = localeMatch[1].toLowerCase(); + } + if (localeMatch[2]) { + OpenSRF.locale = OpenSRF.locale + '-' + localeMatch[2].toUpperCase(); + } }