[open-ils-commits] r12052 - in branches/rel_1_4_0/Open-ILS/web: conify/global opac/skin/default/xml/common

[svn at svn.open-ils.org]

Author: dbs
Date: 2009-02-03 15:58:29 -0500 (Tue, 03 Feb 2009)
New Revision: 12052

Modified:
   branches/rel_1_4_0/Open-ILS/web/conify/global/admin.js
   branches/rel_1_4_0/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
Log:
Merge r12049 and r12050 from trunk to fix Dojo locale-handling issue (#39)


Modified: branches/rel_1_4_0/Open-ILS/web/conify/global/admin.js
===================================================================
--- branches/rel_1_4_0/Open-ILS/web/conify/global/admin.js	2009-02-03 20:57:54 UTC (rev 12051)
+++ branches/rel_1_4_0/Open-ILS/web/conify/global/admin.js	2009-02-03 20:58:29 UTC (rev 12052)
@@ -3,9 +3,9 @@
 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();
 }

Modified: branches/rel_1_4_0/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
===================================================================
--- branches/rel_1_4_0/Open-ILS/web/opac/skin/default/xml/common/js_common.xml	2009-02-03 20:57:54 UTC (rev 12051)
+++ branches/rel_1_4_0/Open-ILS/web/opac/skin/default/xml/common/js_common.xml	2009-02-03 20:58:29 UTC (rev 12052)
@@ -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>