more locale switch work

git-svn-id: svn://svn.open-ils.org/ILS/trunk@10213 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js b/Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js
index fb48a37..53393ad 100644 (file)
--- a/Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js
+++ b/Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js
@@ -157,6 +157,7 @@ if(!dojo._hasResource["fieldmapper.Fieldmapper"]){
 
        }
 
+       fieldmapper.i18n_l.Identifier = 'code';
        fieldmapper.ppl.Identifier = 'code';
        fieldmapper.ccm.Identifier = 'code';
        fieldmapper.cvrfm.Identifier = 'code';

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 b89dacf..79e179c 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
@@ -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;