From 6aab72536fa1dc7089d1e027406eaff76b783b1b Mon Sep 17 00:00:00 2001 From: dbs Date: Tue, 3 Feb 2009 20:58:29 +0000 Subject: [PATCH] Merge r12049 and r12050 from trunk to fix Dojo locale-handling issue (#39) git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_4_0@12052 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/conify/global/admin.js | 4 ++-- Open-ILS/web/opac/skin/default/xml/common/js_common.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Open-ILS/web/conify/global/admin.js b/Open-ILS/web/conify/global/admin.js index ac22a21dd1..58a7e4a910 100644 --- a/Open-ILS/web/conify/global/admin.js +++ b/Open-ILS/web/conify/global/admin.js @@ -3,9 +3,9 @@ var djConfig = { parseOnLoad : true }; if (location.href.match(/^.*conify\/(.+)\/global.*$/, "$1")) { var _url_locale = location.href.replace(/^.*conify\/(.+)\/global.*$/, "$1").replace(/_/,'-','g'); - if (_url_locale) djConfig.locale = _url_locale; + if (_url_locale) djConfig.locale = _url_locale.toLowerCase(); } else { var _url_locale = ''; - if (_url_locale != '(none)') djConfig.locale = _url_locale; + if (_url_locale != '(none)') djConfig.locale = _url_locale.toLowerCase(); } diff --git a/Open-ILS/web/opac/skin/default/xml/common/js_common.xml b/Open-ILS/web/opac/skin/default/xml/common/js_common.xml index 79e179c2b1..508b4cd6ab 100644 --- a/Open-ILS/web/opac/skin/default/xml/common/js_common.xml +++ b/Open-ILS/web/opac/skin/default/xml/common/js_common.xml @@ -41,7 +41,7 @@ var locale = location.href.replace( /.+opac\/([^\/]+)\/skin.+/, '$1' ); if (!locale) locale = ''; - djConfig.locale = locale; + djConfig.locale = locale.toLowerCase(); -- 2.11.0