Just use one messagecatalog (offline.properties) in chrome
authordbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Sat, 19 Jan 2008 20:33:26 +0000 (20:33 +0000)
committerdbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Sat, 19 Jan 2008 20:33:26 +0000 (20:33 +0000)
git-svn-id: svn://svn.open-ils.org/ILS/trunk@8433 dcc99617-32d9-48b4-a31d-7c20da2025e4

17 files changed:
Open-ILS/xul/staff_client/chrome/content/admin/survey.js
Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul
Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
Open-ILS/xul/staff_client/chrome/content/circ/offline.xul
Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.js
Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.xul
Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.js
Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul
Open-ILS/xul/staff_client/chrome/content/circ/offline_in_house_use.js
Open-ILS/xul/staff_client/chrome/content/circ/offline_in_house_use.xul
Open-ILS/xul/staff_client/chrome/content/circ/offline_register.js
Open-ILS/xul/staff_client/chrome/content/circ/offline_register.xul
Open-ILS/xul/staff_client/chrome/content/circ/offline_renew.xul
Open-ILS/xul/staff_client/chrome/locale/en-US/admin.properties [deleted file]
Open-ILS/xul/staff_client/chrome/locale/en-US/cat.properties [deleted file]
Open-ILS/xul/staff_client/chrome/locale/en-US/common.properties [deleted file]
Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties [new file with mode: 0644]

index 9dccae7..24bdcba 100644 (file)
@@ -247,10 +247,10 @@ function add_question_row(my_asvq) {
        g_row_2.appendChild(g_tb);
        if (last_button) last_button.setAttribute('accesskey','');
        var g_b = document.createElement('button');
-       var strbundle = document.getElementById("adminStrings");
-               g_b.setAttribute('label', strbundle.getString('staff.admin.survey.save_response.label'));
-               g_b.setAttribute('accesskey', strbundle.getString('staff.admin.survey.save_response.label'));
-               g_b.setAttribute('oncommand','add_answer(event,' + my_asvq.id() + ');');
+       var strbundle = document.getElementById("offlineStrings");
+       g_b.setAttribute('label', strbundle.getString('staff.admin.survey.save_response.label'));
+       g_b.setAttribute('accesskey', strbundle.getString('staff.admin.survey.save_response.label'));
+       g_b.setAttribute('oncommand','add_answer(event,' + my_asvq.id() + ');');
        g_row_2.appendChild(g_b);
 
        var blank = document.createElement('row');
index 0061170..a340a76 100644 (file)
@@ -28,7 +28,7 @@
                function my_init() {
                        try {
                                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-                               if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing'); }
+                       if (typeof JSAN == 'undefined') { throw( document.getElementById("offlineStrings").getString('common.jsan.missing') ); }
                                JSAN.errorLevel = "die"; // none, warn, or die
                                JSAN.addRepository('..');
                                JSAN.use('util.error'); g.error = new util.error();
@@ -48,7 +48,7 @@
                                document.getElementById('survey_add').canAdvance = false; 
        
                        } catch(E) {
-                               var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['survey_wizard.xul', E]);
+                               var err_msg = document.getElementById("offlineStrings").getFormattedString('common.exception', ['survey_wizard.xul', E]);
                                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
                                alert(err_msg);
                        }
        ]]>
        </script>
 
-       
-       <messagecatalog id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
-       <messagecatalog id="adminStrings" src="chrome://open_ils_staff_client/locale/admin.properties"/>
-       
+       <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
        <!-- Layout to be filled in by overlays and javascript -->
        <wizardpage id="page1"/>
index a5a5e2b..8ecf5dd 100644 (file)
@@ -30,9 +30,7 @@
        <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
        <script type="text/javascript" src="chrome://open_ils_staff_client/content/cat/opac.js"/>
        
-       <messagecatalog id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
-       <messagecatalog id="catStrings" src="chrome://open_ils_staff_client/locale/cat.properties"/>
-       
+       <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
        <vbox flex="1">
                <deck id="top_pane"/>
index f95e756..e9d8992 100644 (file)
        <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
        <script>
        <![CDATA[
-               var circStrings;
-               var commonStrings;
+               var offlineStrings;
 
                function my_init() {
                        try {
-                               circStrings = document.getElementById('circStrings');
-                               commonStrings = document.getElementById('commonStrings');
+                               offlineStrings = document.getElementById('offlineStrings');
 
                                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-                               if (typeof JSAN == 'undefined') { throw(commonStrings.getString('common.jsan.missing')); }
+                               if (typeof JSAN == 'undefined') { throw(offlineStrings.getString('common.jsan.missing')); }
                                JSAN.errorLevel = "die"; // none, warn, or die
                                JSAN.addRepository('..');
                                JSAN.use('util.error'); g.error = new util.error();
                                g.error.sdump('D_TRACE','my_init() for offline.xul');
 
                                if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-                                       try { window.xulG.set_tab_name(circStrings.getString('circ.standalone')); } catch(E) { alert(E); }
+                                       try { window.xulG.set_tab_name(offlineStrings.getString('circ.standalone')); } catch(E) { alert(E); }
                                }
 
                                g.cgi = new CGI();
@@ -68,7 +66,7 @@
                                update_clock();
 
                        } catch(E) {
-                               var err_msg = commonStrings.getFormattedString('common.exception', ["circ/offline.xul", E]);
+                               var err_msg = offlineStrings.getFormattedString('common.exception', ["circ/offline.xul", E]);
                                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
                                alert(err_msg);
                        }
        ]]>
        </script>
 
-       <stringbundleset id="circBundleSet">
-               <stringbundle id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
-               <stringbundle id="circStrings" src="chrome://open_ils_staff_client/locale/circ.properties"/>
-       </stringbundleset>
+    <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
        <groupbox flex="1" class="my_overflow">
                <caption label="&staff.circ.offline.main.label;"/>
index 26fa0fe..8c74f39 100644 (file)
@@ -1,20 +1,18 @@
-var commonStrings;
-var circStrings;
+var offlineStrings;
 
 function my_init() {
        try {
-               commonStrings = $('commonStrings');
-               circStrings = $('circStrings');
+               offlineStrings = $('offlineStrings');
 
                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-               if (typeof JSAN == 'undefined') { throw(commonStrings.getString('common.jsan.missing')); }
+               if (typeof JSAN == 'undefined') { throw(offlineStrings.getString('common.jsan.missing')); }
                JSAN.errorLevel = "die"; // none, warn, or die
                JSAN.addRepository('..');
                JSAN.use('util.error'); g.error = new util.error();
                g.error.sdump('D_TRACE','my_init() for offline_checkin.xul');
 
                if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-                       try { window.xulG.set_tab_name(circStrings.getString('circ.standalone')); } catch(E) { alert(E); }
+                       try { window.xulG.set_tab_name(offlineStrings.getString('circ.standalone')); } catch(E) { alert(E); }
                }
 
                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
@@ -40,7 +38,7 @@ function my_init() {
                if (file._file.exists()) { g.delta = file.get_object()[0]; file.close(); } else { g.delta = 0; }
 
        } catch(E) {
-               var err_msg = commonStrings.getFormattedString('common.exception', ["circ/offline_checkin.xul", E]);
+               var err_msg = offlineStrings.getFormattedString('common.exception', ["circ/offline_checkin.xul", E]);
                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
                alert(err_msg);
        }
@@ -59,7 +57,7 @@ function handle_keypress(ev) {
 function handle_enter(ev) {
        JSAN.use('util.barcode');
        if ( ($('strict_i_barcode').checked) && (! util.barcode.check($('i_barcode').value)) ) {
-               var r = g.error.yns_alert(circStrings.getString('circ.bad_checkdigit'),circStrings.getString('circ.barcode.warning'),commonStrings.getString('common.ok'),commonStrings.getString('common.clear'),null,commonStrings.getString('common.confirm'));
+               var r = g.error.yns_alert(offlineStrings.getString('circ.bad_checkdigit'),offlineStrings.getString('circ.barcode.warning'),offlineStrings.getString('common.ok'),offlineStrings.getString('common.clear'),null,offlineStrings.getString('common.confirm'));
                if (r == 1) {
                        setTimeout(
                                function() {
index 8211c2f..d19616d 100644 (file)
@@ -29,8 +29,7 @@
        <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
        <script type="text/javascript" src="offline_checkin.js"/>
 
-       <messagecatalog id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
-       <messagecatalog id="circStrings" src="chrome://open_ils_staff_client/locale/circ.properties"/>
+       <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
        <groupbox flex="1">
                <caption label="&staff.circ.offline_checkin.main.label;"/>
index 4a90ab9..19da674 100644 (file)
@@ -1,13 +1,11 @@
-var commonStrings;
-var circStrings;
+var offlineStrings;
 
 function my_init() {
        try {
-               commonStrings = $('commonStrings');
-               circStrings = $('circStrings');
+               offlineStrings = $('offlineStrings');
 
                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-               if (typeof JSAN == 'undefined') { throw(commonStrings.getString('common.jsan.missing')); }
+               if (typeof JSAN == 'undefined') { throw(offlineStrings.getString('common.jsan.missing')); }
                JSAN.errorLevel = "die"; // none, warn, or die
                JSAN.addRepository('..');
                JSAN.use('util.error'); g.error = new util.error();
@@ -16,7 +14,7 @@ function my_init() {
                JSAN.use('util.widgets'); JSAN.use('util.file');
 
                if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-                       try { window.xulG.set_tab_name(circStrings.getString('circ.standalone')); } catch(E) { alert(E); }
+                       try { window.xulG.set_tab_name(offlineStrings.getString('circ.standalone')); } catch(E) { alert(E); }
                }
 
                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
@@ -59,28 +57,28 @@ function my_init() {
                if (file._file.exists()) {
                        list_data = file.get_object(); file.close();
                        ml = util.widgets.make_menulist( 
-                               [ [circStrings.getString('circ.offline_checkout.nonbarcoded'), ''] ].concat(list_data[0]), 
+                               [ [offlineStrings.getString('circ.offline_checkout.nonbarcoded'), ''] ].concat(list_data[0]), 
                                list_data[1] 
                        );
                        ml.setAttribute('id','noncat_type_menu'); $('x_noncat_type').appendChild(ml);
                        ml.addEventListener(
                                'command',
                                function(ev) { 
-                                       var count = window.prompt(circStrings.getString('circ.offline_checkout.items'),1,ml.getAttribute('label'));
+                                       var count = window.prompt(offlineStrings.getString('circ.offline_checkout.items'),1,ml.getAttribute('label'));
                                        append_to_list('noncat',count); 
                                        ml.value = '';
                                },
                                false
                        );
                } else {
-                       alert(circStrings.getString('circ.offline_checkout.download.warning'));
+                       alert(offlineStrings.getString('circ.offline_checkout.download.warning'));
                }
 
                var file = new util.file('offline_delta'); 
                if (file._file.exists()) { g.delta = file.get_object()[0]; file.close(); } else { g.delta = 0; }
 
        } catch(E) {
-               var err_msg = commonStrings.getFormattedString('common.exception', ["circ/offline_checkout.xul", E]);
+               var err_msg = offlineStrings.getFormattedString('common.exception', ["circ/offline_checkout.xul", E]);
                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
                alert(err_msg);
        }
@@ -93,7 +91,7 @@ function test_patron(ev) {
                var barcode = ev.target.value;
                JSAN.use('util.barcode');
                if ( ($('strict_p_barcode').checked) && (! util.barcode.check(barcode)) ) {
-                       var r = g.error.yns_alert(circStrings.getString('circ.bad_checkdigit'),circStrings.getString('circ.barcode.warning'),commonStrings.getString('common.ok'),commonStrings.getString('common.clear'),null,commonStrings.getString('common.confirm'));
+                       var r = g.error.yns_alert(offlineStrings.getString('circ.bad_checkdigit'),offlineStrings.getString('circ.barcode.warning'),offlineStrings.getString('common.ok'),offlineStrings.getString('common.clear'),null,offlineStrings.getString('common.confirm'));
                        if (r == 1) {
                                setTimeout(
                                        function() {
@@ -108,15 +106,15 @@ function test_patron(ev) {
                if (g.data.bad_patrons[barcode]) {
                        var code;
                        switch(g.data.bad_patrons[barcode]) {
-                               case 'L' : code = commonStrings.getString('common.barcode.status.warning.lost'); break;
-                               case 'E' : code = commonStrings.getString('common.barcode.status.warning.expired'); break;
-                               case 'B' : code = commonStrings.getString('common.barcode.status.warning.barred'); break;
-                               case 'D' : code = commonStrings.getString('common.barcode.status.warning.blocked'); break;
-                               default : code = commonStrings.getFormattedString('common.barcode.status.warning.blocked', [g.data.bad_patrons[barcode]]); break;
+                               case 'L' : code = offlineStrings.getString('common.barcode.status.warning.lost'); break;
+                               case 'E' : code = offlineStrings.getString('common.barcode.status.warning.expired'); break;
+                               case 'B' : code = offlineStrings.getString('common.barcode.status.warning.barred'); break;
+                               case 'D' : code = offlineStrings.getString('common.barcode.status.warning.blocked'); break;
+                               default : code = offlineStrings.getFormattedString('common.barcode.status.warning.blocked', [g.data.bad_patrons[barcode]]); break;
                        }
 
-                       var msg = commonStrings.getFormattedString('common.barcode.status.warning', [g.data.bad_patrons_date.substr(0,15), barcode, code]);
-                       var r = g.error.yns_alert(msg,circStrings.getString('circ.barcode.warning'),commonStrings.getString('common.ok'),commonStrings.getString('common.clear'),null,commonStrings.getString('common.confirm'));
+                       var msg = offlineStrings.getFormattedString('common.barcode.status.warning', [g.data.bad_patrons_date.substr(0,15), barcode, code]);
+                       var r = g.error.yns_alert(msg,offlineStrings.getString('circ.barcode.warning'),offlineStrings.getString('common.ok'),offlineStrings.getString('common.clear'),null,offlineStrings.getString('common.confirm'));
                        if (r == 1) {
                                setTimeout(
                                        function() {
@@ -134,9 +132,9 @@ function test_patron(ev) {
 function check_date(ev) {
        JSAN.use('util.date');
        try {
-               if (! util.date.check('YYYY-MM-DD',ev.target.value) ) { throw(commonStrings.getString('common.date.invalid')); }
-               if (util.date.check_past('YYYY-MM-DD',ev.target.value) ) { throw(circStrings.getString('circ.offline_checkout.date.early')); }
-               if (util.date.formatted_date(new Date(),'%F') == ev.target.value) { throw(circStrings.getString('circ.offline_checkout.date.early')); }
+               if (! util.date.check('YYYY-MM-DD',ev.target.value) ) { throw(offlineStrings.getString('common.date.invalid')); }
+               if (util.date.check_past('YYYY-MM-DD',ev.target.value) ) { throw(offlineStrings.getString('circ.offline_checkout.date.early')); }
+               if (util.date.formatted_date(new Date(),'%F') == ev.target.value) { throw(offlineStrings.getString('circ.offline_checkout.date.early')); }
        } catch(E) {
                alert(E);
                var today = new Date();
@@ -158,7 +156,7 @@ function handle_keypress(ev) {
 function handle_enter(ev) {
        JSAN.use('util.barcode');
        if ( ($('strict_i_barcode').checked) && (! util.barcode.check($('i_barcode').value)) ) {
-               var r = g.error.yns_alert(circStrings.getString('circ.bad_checkdigit'),circStrings.getString('circ.barcode.warning'),commonStrings.getString('common.ok'),commonStrings.getString('common.clear'),null,commonStrings.getString('common.confirm'));
+               var r = g.error.yns_alert(offlineStrings.getString('circ.bad_checkdigit'),offlineStrings.getString('circ.barcode.warning'),offlineStrings.getString('common.ok'),offlineStrings.getString('common.clear'),null,offlineStrings.getString('common.confirm'));
                if (r == 1) {
                        setTimeout(
                                function() {
@@ -197,7 +195,7 @@ function append_to_list(checkout_type,count) {
 
                var p_barcode = $('p_barcode').value;
                if (! p_barcode) {
-                       g.error.yns_alert(circStrings.getString('circ.barcode.enter'),circStrings.getString('circ.offline_checkout.required_field'),commonStrings.getString('common.ok'),null,null,commonStrings.getString('common.confirm'));
+                       g.error.yns_alert(offlineStrings.getString('circ.barcode.enter'),offlineStrings.getString('circ.offline_checkout.required_field'),offlineStrings.getString('common.ok'),null,null,offlineStrings.getString('common.confirm'));
                        return;
                } else {
 
@@ -216,7 +214,7 @@ function append_to_list(checkout_type,count) {
                                var rows = g.list.dump_with_keys();
                                for (var i = 0; i < rows.length; i++) {
                                        if (rows[i].barcode == i_barcode) {
-                                               g.error.yns_alert(circStrings.getString('circ.duplicate_scan.msg'),circStrings.getString('circ.duplicate_scan.field'),commonStrings.getString('common.ok'),null,null,commonStrings.getString('common.confirm'));
+                                               g.error.yns_alert(offlineStrings.getString('circ.duplicate_scan.msg'),offlineStrings.getString('circ.duplicate_scan.field'),offlineStrings.getString('common.ok'),null,null,offlineStrings.getString('common.confirm'));
                                                return;
                                        }
                                }
@@ -225,7 +223,7 @@ function append_to_list(checkout_type,count) {
                        break;
                        case 'noncat' :
                                count = parseInt(count); if (! (count>0) ) {
-                                       g.error.yns_alert(circStrings.getString('circ.offline_checkout.valid_count'),circStrings.getString('circ.offline_checkout.required_value'),commonStrings.getString('common.ok'),null,null,commonStrings.getString('common.confirm'));
+                                       g.error.yns_alert(offlineStrings.getString('circ.offline_checkout.valid_count'),offlineStrings.getString('circ.offline_checkout.required_value'),offlineStrings.getString('common.ok'),null,null,offlineStrings.getString('common.confirm'));
                                        return;
                                }
                                my.barcode = $('noncat_type_menu').getAttribute('label');
@@ -233,7 +231,7 @@ function append_to_list(checkout_type,count) {
                                my.noncat_type = JSON2js($('noncat_type_menu').value)[0];
                                my.noncat_count = count;
                        break;
-                       default: alert(commonStrings.getString('common.error.default')); break;
+                       default: alert(offlineStrings.getString('common.error.default')); break;
                }
        
                g.list.append( { 'row' : { 'my' : my }, 'to_top' : true } );
index 4d0aede..b4d23df 100644 (file)
@@ -29,8 +29,7 @@
        <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
        <script type="text/javascript" src="offline_checkout.js"/>
 
-       <messagecatalog id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
-       <messagecatalog id="circStrings" src="chrome://open_ils_staff_client/locale/circ.properties"/>
+       <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
        <groupbox flex="1">
                <caption label="&staff.circ.offline_checkout.main.label;"/>
index 9f825cc..8aa5d2a 100644 (file)
@@ -1,20 +1,18 @@
-var commonStrings;
-var circStrings;
+var offlineStrings;
 
 function my_init() {
        try {
-               commonStrings = document.getElementById('commonStrings');
-               circStrings = document.getElementById('circStrings');
+               offlineStrings = document.getElementById('offlineStrings');
 
                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-               if (typeof JSAN == 'undefined') { throw(commonStrings.getString('common.jsan.missing')); }
+               if (typeof JSAN == 'undefined') { throw(offlineStrings.getString('common.jsan.missing')); }
                JSAN.errorLevel = "die"; // none, warn, or die
                JSAN.addRepository('..');
                JSAN.use('util.error'); g.error = new util.error();
                g.error.sdump('D_TRACE','my_init() for offline_checkout.xul');
 
                if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-                       try { window.xulG.set_tab_name(circStrings.getString('circ.standalone')); } catch(E) { alert(E); }
+                       try { window.xulG.set_tab_name(offlineStrings.getString('circ.standalone')); } catch(E) { alert(E); }
                }
 
                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
@@ -37,7 +35,7 @@ function my_init() {
                if (file._file.exists()) { g.delta = file.get_object()[0]; file.close(); } else { g.delta = 0; }
 
        } catch(E) {
-               var err_msg = commonStrings.getFormattedString('common.exception', ["circ/offline_in_house_use.xul", E]);
+               var err_msg = offlineStrings.getFormattedString('common.exception', ["circ/offline_in_house_use.xul", E]);
                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
                alert(err_msg);
        }
@@ -56,7 +54,7 @@ function handle_keypress(ev) {
 function handle_enter(ev) {
        JSAN.use('util.barcode');
        if ( ($('strict_i_barcode').checked) && (! util.barcode.check($('i_barcode').value)) ) {
-               var r = g.error.yns_alert(circStrings.getString('circ.bad_checkdigit'),circStrings.getString('circ.barcode.warning'),commonStrings.getString('common.ok'),commonStrings.getString('common.clear'),null,commonStrings.getString('common.confirm'));
+               var r = g.error.yns_alert(offlineStrings.getString('circ.bad_checkdigit'),offlineStrings.getString('circ.barcode.warning'),offlineStrings.getString('common.ok'),offlineStrings.getString('common.clear'),null,offlineStrings.getString('common.confirm'));
                if (r == 1) {
                        setTimeout(
                                function() {
index fb6f7a1..91ec999 100644 (file)
@@ -29,8 +29,7 @@
        <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
        <script type="text/javascript" src="offline_in_house_use.js"/>
 
-       <messagecatalog id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
-       <messagecatalog id="circStrings" src="chrome://open_ils_staff_client/locale/circ.properties"/>
+       <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
        <groupbox flex="1">
                <caption label="&staff.circ.offline_in_house_use.main.label;"/>
index 4f2a8f7..f2c94d0 100644 (file)
@@ -1,13 +1,11 @@
-var commonStrings;
-var circStrings;
+var offlineStrings;
 
 function my_init() {
        try {
-               commonStrings = $('commonStrings');
-               circStrings = $('circStrings');
+               offlineStrings = $('offlineStrings');
 
                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-               if (typeof JSAN == 'undefined') { throw(commonStrings.getString('common.jsan.missing')); }
+               if (typeof JSAN == 'undefined') { throw(offlineStrings.getString('common.jsan.missing')); }
                JSAN.errorLevel = "die"; // none, warn, or die
                JSAN.addRepository('..');
                JSAN.use('util.error'); g.error = new util.error();
@@ -16,7 +14,7 @@ function my_init() {
                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
 
                if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-                       try { window.xulG.set_tab_name(circStrings.getString('circ.standalone')); } catch(E) { alert(E); }
+                       try { window.xulG.set_tab_name(offlineStrings.getString('circ.standalone')); } catch(E) { alert(E); }
                }
 
                $('barcode').addEventListener('change',test_patron,false);
@@ -34,7 +32,7 @@ function my_init() {
                        ml = util.widgets.make_menulist( list_data[0], list_data[1] );
                        ml.setAttribute('id','home_ou'); $('x_home_ou').appendChild(ml);
                } else {
-                       errors += circStrings.getString('circ.offline_register.missing.library.list') + "\n";
+                       errors += offlineStrings.getString('circ.offline_register.missing.library.list') + "\n";
                }
 
                file = new util.file('offline_pgt_list');
@@ -43,7 +41,7 @@ function my_init() {
                        ml = util.widgets.make_menulist( list_data[0], list_data[1] );
                        ml.setAttribute('id','profile'); $('x_profile').appendChild(ml);
                } else {
-                       errors += circStrings.getString('circ.offline_register.missing.profile.list') + "\n";
+                       errors += offlineStrings.getString('circ.offline_register.missing.profile.list') + "\n";
                }
 
                file = new util.file('offline_cit_list'); 
@@ -52,7 +50,7 @@ function my_init() {
                        ml = util.widgets.make_menulist( list_data[0], list_data[1] );
                        ml.setAttribute('id','ident_type'); $('x_ident_type').appendChild(ml);
                } else {
-                       errors += circStrings.getString('circ.offline_register.missing.id.type.list') + "\n";
+                       errors += offlineStrings.getString('circ.offline_register.missing.id.type.list') + "\n";
                }
 
                file = new util.file('offline_asv_list'); 
@@ -60,11 +58,11 @@ function my_init() {
                        list_data = file.get_object(); file.close();
                        render_surveys('x_surveys', list_data);
                } else {
-                       errors += circStrings.getString('circ.offline_register.missing.required.surveys');
+                       errors += offlineStrings.getString('circ.offline_register.missing.required.surveys');
                }
 
                if (errors != '') {
-                       alert(circStrings.getString('circ.offline_register.missing.files.error') + errors);
+                       alert(offlineStrings.getString('circ.offline_register.missing.files.error') + errors);
                        location.href = 'about:blank';
                }
 
@@ -77,7 +75,7 @@ function my_init() {
                if (file._file.exists()) { g.delta = file.get_object()[0]; file.close(); } else { g.delta = 0; }
 
        } catch(E) {
-               var err_msg = commonStrings.getFormattedString('common.exception', ["circ/offline_register.xul", E]);
+               var err_msg = offlineStrings.getFormattedString('common.exception', ["circ/offline_register.xul", E]);
                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
                alert(err_msg);
        }
@@ -90,7 +88,7 @@ function test_patron(ev) {
                var barcode = ev.target.value;
                JSAN.use('util.barcode');
                if ( ! util.barcode.check(ev.target.value) ) {
-                       var r = g.error.yns_alert(circStrings.getString('circ.bad_checkdigit'),circStrings.getString('circ.barcode.warning'),commonStrings.getString('common.ok'),commonStrings.getString('common.clear'),null,commonStrings.getString('common.confirm'));
+                       var r = g.error.yns_alert(offlineStrings.getString('circ.bad_checkdigit'),offlineStrings.getString('circ.barcode.warning'),offlineStrings.getString('common.ok'),offlineStrings.getString('common.clear'),null,offlineStrings.getString('common.confirm'));
                        if (r == 1) {
                                setTimeout(
                                        function() {
@@ -104,15 +102,15 @@ function test_patron(ev) {
                if (g.data.bad_patrons[barcode]) {
                        var code;
                        switch(g.data.bad_patrons[barcode]) {
-                               case 'L' : code = commonStrings.getString('common.barcode.status.warning.lost'); break;
-                               case 'E' : code = commonStrings.getString('common.barcode.status.warning.expired'); break;
-                               case 'B' : code = commonStrings.getString('common.barcode.status.warning.barred'); break;
-                               case 'D' : code = commonStrings.getString('common.barcode.status.warning.blocked'); break;
-                               default : code = commonStrings.getFormattedString('common.barcode.status.warning.blocked', [g.data.bad_patrons[barcode]]); break;
+                               case 'L' : code = offlineStrings.getString('common.barcode.status.warning.lost'); break;
+                               case 'E' : code = offlineStrings.getString('common.barcode.status.warning.expired'); break;
+                               case 'B' : code = offlineStrings.getString('common.barcode.status.warning.barred'); break;
+                               case 'D' : code = offlineStrings.getString('common.barcode.status.warning.blocked'); break;
+                               default : code = offlineStrings.getFormattedString('common.barcode.status.warning.blocked', [g.data.bad_patrons[barcode]]); break;
                        }
 
-                       var msg = commonStrings.getFormattedString('common.barcode.status.warning', [g.data.bad_patrons_date.substr(0,15), barcode, code]);
-                       var r = g.error.yns_alert(msg,circStrings.getString('circ.barcode.warning'),commonStrings.getString('common.ok'),commonStrings.getString('common.clear'),null,commonStrings.getString('common.confirm'));
+                       var msg = offlineStrings.getFormattedString('common.barcode.status.warning', [g.data.bad_patrons_date.substr(0,15), barcode, code]);
+                       var r = g.error.yns_alert(msg,offlineStrings.getString('circ.barcode.warning'),offlineStrings.getString('common.ok'),offlineStrings.getString('common.clear'),null,offlineStrings.getString('common.confirm'));
                        if (r == 1) {
                                setTimeout(
                                        function() {
@@ -134,9 +132,9 @@ function handle_check_date(ev) {
 function check_date(value) {
        JSAN.use('util.date');
        try {
-               if (! util.date.check('YYYY-MM-DD',value) ) { throw(commonStrings.getString('common.date.invalid')); }
-               if (! util.date.check_past('YYYY-MM-DD',value) ) { throw(circStrings.getString('circ.offline_register.future.birth.date')); }
-               if ( util.date.formatted_date(new Date(),'%F') == value) { throw(circStrings.getString('circ.offline_register.invalid.birth.date')); }
+               if (! util.date.check('YYYY-MM-DD',value) ) { throw(offlineStrings.getString('common.date.invalid')); }
+               if (! util.date.check_past('YYYY-MM-DD',value) ) { throw(offlineStrings.getString('circ.offline_register.future.birth.date')); }
+               if ( util.date.formatted_date(new Date(),'%F') == value) { throw(offlineStrings.getString('circ.offline_register.invalid.birth.date')); }
        } catch(E) {
                alert(E);
                value = '';
@@ -164,7 +162,7 @@ function render_surveys(node,obj) {
                        x_gb.appendChild(x_hb);
                        var x_spacer = document.createElement('spacer'); x_spacer.setAttribute('flex','1');
                        x_hb.appendChild(x_spacer);
-                       var x_ml = util.widgets.make_menulist( [ [circStrings.getString('circ.offline_register.survey.prompt'),''] ].concat(question.answers) );
+                       var x_ml = util.widgets.make_menulist( [ [offlineStrings.getString('circ.offline_register.survey.prompt'),''] ].concat(question.answers) );
                        x_ml.setAttribute('name','survey'); x_hb.appendChild(x_ml);
                }
        }
@@ -181,91 +179,91 @@ function handle_keypress(ev) {
 function check_patron(obj) {
        var errors = '';
        if (! obj.user.billing_address.post_code ) {
-               errors += circStrings.getString('circ.offline_register.missing.post_code') + "\n";
+               errors += offlineStrings.getString('circ.offline_register.missing.post_code') + "\n";
                $('post_code').focus();
                $('post_code').parentNode.setAttribute('style','background-color: red');
        } else {
                $('post_code').parentNode.setAttribute('style','');
        }
        if (! obj.user.billing_address.state ) {
-               errors += circStrings.getString('circ.offline_register.missing.state') + "\n";
+               errors += offlineStrings.getString('circ.offline_register.missing.state') + "\n";
                $('state').focus();
                $('state').parentNode.setAttribute('style','background-color: red');
        } else {
                $('state').parentNode.setAttribute('style','');
        }
        if (! obj.user.billing_address.city ) {
-               errors += circStrings.getString('circ.offline_register.missing.city') + "\n";
+               errors += offlineStrings.getString('circ.offline_register.missing.city') + "\n";
                $('city').focus();
                $('city').parentNode.setAttribute('style','background-color: red');
        } else {
                $('city').parentNode.setAttribute('style','');
        }
        if (! obj.user.billing_address.street1 ) {
-               errors += circStrings.getString('circ.offline_register.missing.street1') + "\n";
+               errors += offlineStrings.getString('circ.offline_register.missing.street1') + "\n";
                $('street1').focus();
                $('street1').parentNode.setAttribute('style','background-color: red');
        } else {
                $('street1').parentNode.setAttribute('style','');
        }
        if (! obj.user.ident_value ) {
-               errors += circStrings.getString('circ.offline_register.missing.ident_value') + "\n";
+               errors += offlineStrings.getString('circ.offline_register.missing.ident_value') + "\n";
                $('ident_value').focus();
                $('ident_value').parentNode.setAttribute('style','background-color: red');
        } else {
                $('ident_value').parentNode.setAttribute('style','');
        }
        if (! obj.user.ident_type ) {
-               errors += circStrings.getString('circ.offline_register.missing.ident_type') + "\n";
+               errors += offlineStrings.getString('circ.offline_register.missing.ident_type') + "\n";
                $('ident_type').focus();
                $('ident_type').parentNode.setAttribute('style','background-color: red');
        } else {
                $('ident_type').parentNode.setAttribute('style','');
        }
        if (! obj.user.dob ) {
-               errors += circStrings.getString('circ.offline_register.missing.dob') + "\n";
+               errors += offlineStrings.getString('circ.offline_register.missing.dob') + "\n";
                $('dob').focus();
                $('dob').parentNode.parentNode.setAttribute('style','background-color: red');
        } else {
                $('dob').parentNode.parentNode.setAttribute('style','');
        }
        if (! obj.user.first_given_name ) {
-               errors += circStrings.getString('circ.offline_register.missing.first_given_name') + "\n";
+               errors += offlineStrings.getString('circ.offline_register.missing.first_given_name') + "\n";
                $('first_given_name').focus();
                $('first_given_name').parentNode.setAttribute('style','background-color: red');
        } else {
                $('first_given_name').parentNode.setAttribute('style','');
        }
        if (! obj.user.family_name ) {
-               errors += circStrings.getString('circ.offline_register.missing.family_name') + "\n";
+               errors += offlineStrings.getString('circ.offline_register.missing.family_name') + "\n";
                $('family_name').focus();
                $('family_name').parentNode.setAttribute('style','background-color: red');
        } else {
                $('family_name').parentNode.setAttribute('style','');
        }
        if (! obj.user.passwd ) {
-               errors += circStrings.getString('circ.offline_register.missing.passwd') + "\n";
+               errors += offlineStrings.getString('circ.offline_register.missing.passwd') + "\n";
                $('passwd').focus();
                $('passwd').parentNode.setAttribute('style','background-color: red');
        } else {
                $('passwd').parentNode.setAttribute('style','');
        }
        if (! obj.user.card.barcode ) {
-               errors += circStrings.getString('circ.offline_register.missing.barcode') + "\n";
+               errors += offlineStrings.getString('circ.offline_register.missing.barcode') + "\n";
                $('barcode').focus();
                $('barcode').parentNode.setAttribute('style','background-color: red');
        } else {
                $('barcode').parentNode.setAttribute('style','');
        }
        if (! obj.user.profile ) {
-               errors += circStrings.getString('circ.offline_register.missing.profile') + "\n";
+               errors += offlineStrings.getString('circ.offline_register.missing.profile') + "\n";
                $('profile').focus();
                $('profile').parentNode.setAttribute('style','background-color: red');
        } else {
                $('profile').parentNode.setAttribute('style','');
        }
        if (! obj.user.home_ou ) {
-               errors += circStrings.getString('circ.offline_register.missing.home_ou') + "\n";
+               errors += offlineStrings.getString('circ.offline_register.missing.home_ou') + "\n";
                $('home_ou').focus();
                $('home_ou').parentNode.setAttribute('style','background-color: red');
        } else {
@@ -309,7 +307,7 @@ function next_patron() {
                try {
                        check_patron(obj);
                } catch(E) {
-                       alert(circStrings.getString('circ.offline_register.missing.alert') + "\n" + E);
+                       alert(offlineStrings.getString('circ.offline_register.missing.alert') + "\n" + E);
                        return;
                }
 
@@ -318,7 +316,7 @@ function next_patron() {
                file.append_object(obj);
                file.close();
 
-               alert(circStrings.getString('circ.offline_register.patron.saved'));
+               alert(offlineStrings.getString('circ.offline_register.patron.saved'));
 
                $('passwd').value = parseInt(Math.random()*8999+1000);
                $('barcode').value = ''; $('ident_value').value = ''; $('first_given_name').value = '';
index a1d4287..e6d9fdc 100644 (file)
@@ -29,8 +29,7 @@
        <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
        <script type="text/javascript" src="offline_register.js"/>
 
-       <messagecatalog id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
-       <messagecatalog id="circStrings" src="chrome://open_ils_staff_client/locale/circ.properties"/>
+       <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
        <groupbox flex="1">
                <caption label="&staff.circ.offline_register.main.label;"/>
index e8a27bf..44332d4 100644 (file)
@@ -29,8 +29,7 @@
        <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
        <script type="text/javascript" src="offline_renew.js"/>
 
-       <messagecatalog id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
-       <messagecatalog id="circStrings" src="chrome://open_ils_staff_client/locale/circ.properties"/>
+       <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
        <groupbox flex="1">
                <caption label="&staff.circ.offline_renew.main.label;"/>
diff --git a/Open-ILS/xul/staff_client/chrome/locale/en-US/admin.properties b/Open-ILS/xul/staff_client/chrome/locale/en-US/admin.properties
deleted file mode 100644 (file)
index 011e9fc..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-staff.admin.survey.save_response.label=Save this response
-staff.admin.survey.save_response.accesskey=R
-staff.admin.font_settings.sound=Sound preference saved to file system.
-staff.admin.font_settings.save=Global Font saved to file system.
-staff.admin.font_settings.sound.disabled=Sound is now disabled.
-staff.admin.font_settings.sound.enabled=Sound is now enabled.
-staff.admin.font_settings.status_msg.ALL_FONTS_SMALLER=Global Font Adjust set to Smaller than Default
-staff.admin.font_settings.status_msg.ALL_FONTS_DEFAULT=Global Font Adjust set to Default
-staff.admin.font_settings.status_msg.ALL_FONTS_LARGER=Global Font Adjust set to Larger than Default
-staff.admin.font_settings.status_msg.ALL_FONTS_XX_SMALL=Global Font set to XX-Small
-staff.admin.font_settings.status_msg.ALL_FONTS_X_SMALL=Global Font set to X-Small
-staff.admin.font_settings.status_msg.ALL_FONTS_SMALL=Global Font set to Small
-staff.admin.font_settings.status_msg.ALL_FONTS_MEDIUM=Global Font set to Medium
-staff.admin.font_settings.status_msg.ALL_FONTS_LARGE=Global Font set to Large
-staff.admin.font_settings.status_msg.ALL_FONTS_X_LARGE=Global Font set to X-Large
-staff.admin.font_settings.status_msg.ALL_FONTS_XX_LARGE=Global Font set to XX-Large
-staff.admin.font_settings.status_msg.ALL_FONTS_5PT=Global Font set to 5pt
-staff.admin.font_settings.status_msg.ALL_FONTS_6PT=Global Font set to 6pt
-staff.admin.font_settings.status_msg.ALL_FONTS_7PT=Global Font set to 7pt
-staff.admin.font_settings.status_msg.ALL_FONTS_8PT=Global Font set to 8pt
-staff.admin.font_settings.status_msg.ALL_FONTS_9PT=Global Font set to 9pt
-staff.admin.font_settings.status_msg.ALL_FONTS_10PT=Global Font set to 10pt
-staff.admin.font_settings.status_msg.ALL_FONTS_11PT=Global Font set to 11pt
-staff.admin.font_settings.status_msg.ALL_FONTS_12PT=Global Font set to 12pt
-staff.admin.font_settings.status_msg.ALL_FONTS_13PT=Global Font set to 13pt
-staff.admin.font_settings.status_msg.ALL_FONTS_14PT=Global Font set to 14pt
-staff.admin.font_settings.status_msg.ALL_FONTS_15PT=Global Font set to 15pt
-staff.admin.font_settings.status_msg.ALL_FONTS_16PT=Global Font set to 16pt
-staff.admin.font_settings.status_msg.ALL_FONTS_17PT=Global Font set to 17pt
-staff.admin.font_settings.status_msg.ALL_FONTS_18PT=Global Font set to 18pt
-staff.admin.font_settings.status_msg.ALL_FONTS_DEFAULT=Global Font Adjust set to Default
diff --git a/Open-ILS/xul/staff_client/chrome/locale/en-US/cat.properties b/Open-ILS/xul/staff_client/chrome/locale/en-US/cat.properties
deleted file mode 100644 (file)
index 9570edf..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-cat.bib_record=Bib Record: %1$s
-cat.save_record=Save Record
-cat.save.success=Record successfully saved.
-cat.save.failure=Record not likely updated.
-cat.record.counter=Record %1$s of %2$s
-cat.preference.error=Preference not likely updated.
diff --git a/Open-ILS/xul/staff_client/chrome/locale/en-US/common.properties b/Open-ILS/xul/staff_client/chrome/locale/en-US/common.properties
deleted file mode 100644 (file)
index bc454ca..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-common.exception=!! This software has encountered an error.  Please tell your friendly system administrator or software developer the following:\n%1$s\n%2$s\n
-common.jsan.missing=The JSAN library object is missing.
-common.ok=Ok
-common.clear=Clear
-common.confirm=Check here to confirm this message.
-common.error.default=Please report that this happened.
-common.barcode.status.warning=Warning: As of %1$s, this barcode (%2$s) was flagged %3.
-common.barcode.status.warning.lost=Lost
-common.barcode.status.warning.expired=Expired
-common.barcode.status.warning.barred=Barred
-common.barcode.status.warning.blocked=Blocked
-common.barcode.status.warning.unknown=with an unknown code: %1$s
-common.date.invalid=Invalid Date
diff --git a/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties b/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties
new file mode 100644 (file)
index 0000000..8405f32
--- /dev/null
@@ -0,0 +1,21 @@
+common.exception=!! This software has encountered an error.  Please tell your friendly system administrator or software developer the following:\n%1$s\n%2$s\n
+common.jsan.missing=The JSAN library object is missing.
+common.ok=Ok
+common.clear=Clear
+common.confirm=Check here to confirm this message.
+common.error.default=Please report that this happened.
+common.barcode.status.warning=Warning: As of %1$s, this barcode (%2$s) was flagged %3.
+common.barcode.status.warning.lost=Lost
+common.barcode.status.warning.expired=Expired
+common.barcode.status.warning.barred=Barred
+common.barcode.status.warning.blocked=Blocked
+common.barcode.status.warning.unknown=with an unknown code: %1$s
+common.date.invalid=Invalid Date
+cat.bib_record=Bib Record: %1$s
+cat.save_record=Save Record
+cat.save.success=Record successfully saved.
+cat.save.failure=Record not likely updated.
+cat.record.counter=Record %1$s of %2$s
+cat.preference.error=Preference not likely updated.
+staff.admin.survey.save_response.label=Save this response
+staff.admin.survey.save_response.accesskey=R