[open-ils-commits] r10213 - in trunk/Open-ILS/web: js/dojo/fieldmapper opac/skin/default/xml/common

[svn at svn.open-ils.org]

Author: miker
Date: 2008-07-31 01:22:51 -0400 (Thu, 31 Jul 2008)
New Revision: 10213

Modified:
   trunk/Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js
   trunk/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
Log:
more locale switch work

Modified: trunk/Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js	2008-07-31 05:21:54 UTC (rev 10212)
+++ trunk/Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js	2008-07-31 05:22:51 UTC (rev 10213)
@@ -157,6 +157,7 @@
 
 	}
 
+	fieldmapper.i18n_l.Identifier = 'code';
 	fieldmapper.ppl.Identifier = 'code';
 	fieldmapper.ccm.Identifier = 'code';
 	fieldmapper.cvrfm.Identifier = 'code';

Modified: trunk/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/xml/common/js_common.xml	2008-07-31 05:21:54 UTC (rev 10212)
+++ trunk/Open-ILS/web/opac/skin/default/xml/common/js_common.xml	2008-07-31 05:22:51 UTC (rev 10213)
@@ -36,11 +36,9 @@
     <!-- enable Dojo date picker -->
     <script language='javascript' type="text/javascript">
 
-        var djConfig = {parseOnLoad: true, isDebug: false},
-            lang,
-            bidi;
+        var djConfig = {parseOnLoad: true, isDebug: false}, lang, bidi;
 
-        var locale = location.href.match( /opac\/([^\/]+)\/skin/ )[0];
+        var locale = location.href.replace( /.+opac\/([^\/]+)\/skin.+/, '$1' );
         if (!locale) locale = '<!--#echo var="locale"-->';
 
         djConfig.locale = locale;