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

diff --git a/Open-ILS/web/conify/global/admin.js b/Open-ILS/web/conify/global/admin.js
index ac22a21..58a7e4a 100644 (file)
--- 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 = '<!--#echo var="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 79e179c..508b4cd 100644 (file)
--- 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 = '<!--#echo var="locale"-->';
 
-        djConfig.locale = locale;
+        djConfig.locale = locale.toLowerCase();
 
     </script>