start replacing messagecatalog with stringbudle
authorGalen Charlton <gmc@esilibrary.com>
Wed, 30 Jan 2013 15:46:29 +0000 (10:46 -0500)
committerGalen Charlton <gmc@esilibrary.com>
Wed, 30 Jan 2013 17:54:27 +0000 (12:54 -0500)
NOTE: "%n$s" in properties must be replaced with "%n$S"

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
101 files changed:
Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
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.xul
Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul
Open-ILS/xul/staff_client/chrome/content/circ/offline_in_house_use.xul
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/content/main/bindings.xml
Open-ILS/xul/staff_client/chrome/content/main/main.js
Open-ILS/xul/staff_client/chrome/content/main/main.xul
Open-ILS/xul/staff_client/chrome/content/main/menu.js
Open-ILS/xul/staff_client/chrome/content/main/menu_frame.xul
Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul
Open-ILS/xul/staff_client/chrome/locale/en-US/auth.properties
Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties
Open-ILS/xul/staff_client/chrome/skin/global.css
Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
Open-ILS/xul/staff_client/server/admin/circ_age_to_lost.xul
Open-ILS/xul/staff_client/server/admin/do_not_auto_attempt_print_setting.xul
Open-ILS/xul/staff_client/server/admin/font_settings.xul
Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul
Open-ILS/xul/staff_client/server/admin/patrons_due_refunds.xul
Open-ILS/xul/staff_client/server/admin/printer_settings.xul
Open-ILS/xul/staff_client/server/admin/toolbar.xul
Open-ILS/xul/staff_client/server/admin/transit_list.xul
Open-ILS/xul/staff_client/server/admin/work_log.xul
Open-ILS/xul/staff_client/server/cat/bib_brief.js
Open-ILS/xul/staff_client/server/cat/bib_brief.xul
Open-ILS/xul/staff_client/server/cat/bib_brief_vertical.xul
Open-ILS/xul/staff_client/server/cat/copy_browser.xul
Open-ILS/xul/staff_client/server/cat/copy_buckets.xul
Open-ILS/xul/staff_client/server/cat/copy_buckets_quick.xul
Open-ILS/xul/staff_client/server/cat/copy_editor.js
Open-ILS/xul/staff_client/server/cat/copy_editor.xul
Open-ILS/xul/staff_client/server/cat/copy_notes.xul
Open-ILS/xul/staff_client/server/cat/copy_summary.xul
Open-ILS/xul/staff_client/server/cat/manage_multi_home_items.xul
Open-ILS/xul/staff_client/server/cat/marc_new.xul
Open-ILS/xul/staff_client/server/cat/marc_view.xul
Open-ILS/xul/staff_client/server/cat/marcedit.css
Open-ILS/xul/staff_client/server/cat/marcedit.xul
Open-ILS/xul/staff_client/server/cat/record_buckets.xul
Open-ILS/xul/staff_client/server/cat/record_buckets_overlay.xul
Open-ILS/xul/staff_client/server/cat/record_buckets_quick.xul
Open-ILS/xul/staff_client/server/cat/spine_labels.xul
Open-ILS/xul/staff_client/server/cat/volume_buckets.xul
Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul
Open-ILS/xul/staff_client/server/cat/volume_copy_editor_horiz.xul
Open-ILS/xul/staff_client/server/cat/volume_editor.xul
Open-ILS/xul/staff_client/server/cat/z3950.js
Open-ILS/xul/staff_client/server/cat/z3950.xul
Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul
Open-ILS/xul/staff_client/server/circ/backdate_post_checkin.xul
Open-ILS/xul/staff_client/server/circ/checkin.xul
Open-ILS/xul/staff_client/server/circ/checkout.xul
Open-ILS/xul/staff_client/server/circ/circ_brief.xul
Open-ILS/xul/staff_client/server/circ/copy_details.xul
Open-ILS/xul/staff_client/server/circ/copy_status.xul
Open-ILS/xul/staff_client/server/circ/in_house_use.xul
Open-ILS/xul/staff_client/server/circ/missing_pieces.xul
Open-ILS/xul/staff_client/server/circ/pre_cat_fields.xul
Open-ILS/xul/staff_client/server/circ/print_list_template_editor.xul
Open-ILS/xul/staff_client/server/circ/renew.xul
Open-ILS/xul/staff_client/server/main/verify_credentials.xul
Open-ILS/xul/staff_client/server/patron/barcode_entry.xul
Open-ILS/xul/staff_client/server/patron/bill2.xul
Open-ILS/xul/staff_client/server/patron/bill_cc_info.xul
Open-ILS/xul/staff_client/server/patron/bill_check_info.xul
Open-ILS/xul/staff_client/server/patron/bill_details.xul
Open-ILS/xul/staff_client/server/patron/bill_history.xul
Open-ILS/xul/staff_client/server/patron/bill_wizard.xul
Open-ILS/xul/staff_client/server/patron/display.xul
Open-ILS/xul/staff_client/server/patron/display_horiz.xul
Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.xul
Open-ILS/xul/staff_client/server/patron/hold_cancel.xul
Open-ILS/xul/staff_client/server/patron/hold_details.xul
Open-ILS/xul/staff_client/server/patron/holds.xul
Open-ILS/xul/staff_client/server/patron/info_group.xul
Open-ILS/xul/staff_client/server/patron/info_notes.xul
Open-ILS/xul/staff_client/server/patron/info_stat_cats.xul
Open-ILS/xul/staff_client/server/patron/info_surveys.xul
Open-ILS/xul/staff_client/server/patron/items.xul
Open-ILS/xul/staff_client/server/patron/new_standing_penalty.xul
Open-ILS/xul/staff_client/server/patron/place_hold.xul
Open-ILS/xul/staff_client/server/patron/search_form.xul
Open-ILS/xul/staff_client/server/patron/search_form_horiz.xul
Open-ILS/xul/staff_client/server/patron/search_result.xul
Open-ILS/xul/staff_client/server/patron/staged.xul
Open-ILS/xul/staff_client/server/patron/standing_penalties.xul
Open-ILS/xul/staff_client/server/patron/summary.xul
Open-ILS/xul/staff_client/server/patron/user_edit.xul
Open-ILS/xul/staff_client/server/serial/batch_receive.xul
Open-ILS/xul/staff_client/server/serial/notes.xul
Open-ILS/xul/staff_client/server/serial/pattern_wizard.xul
Open-ILS/xul/staff_client/server/serial/select_aou.xul
Open-ILS/xul/staff_client/server/serial/select_unit.xul
Open-ILS/xul/staff_client/server/serial/serctrl_main.xul
Open-ILS/xul/staff_client/server/serial/sitem_editor.xul
Open-ILS/xul/staff_client/server/skin/global.css

index c3b9e47..b511c9c 100644 (file)
@@ -63,8 +63,8 @@
         <script type='text/javascript' src='util/en-US/OrgTree.js' />
         <script type="text/javascript" src="util/org_utils.js" />   
         <script type="text/javascript" src="global_util.js" />   
-        <messagecatalog id="offlineStrings" src='chrome://open_ils_staff_client/locale/offline.properties'/>
-        <messagecatalog id="authStrings" src='chrome://open_ils_staff_client/locale/auth.properties'/>
+        <stringbundle id="offlineStrings" src='chrome://open_ils_staff_client/locale/offline.properties'/>
+        <stringbundle id="authStrings" src='chrome://open_ils_staff_client/locale/auth.properties'/>
         <hbox id="debug_box" hidden="true" flex="1" style="border: red thin dashed">
             <label value="Debug:" />
             <textbox id="debug_tb" flex="1"/>
index 6fe3dba..50744ab 100644 (file)
@@ -54,7 +54,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <stringbundle id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
     <!-- Layout to be filled in by overlays and javascript -->
     <wizardpage id="page1"/>
index ab15bc3..bc848ce 100644 (file)
@@ -29,7 +29,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="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <stringbundle id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
     <vbox flex="1">
         <deck id="top_pane"/>
index dbd9111..7e56aa5 100644 (file)
@@ -75,7 +75,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <stringbundle 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 8c43929..eddf56c 100644 (file)
@@ -29,7 +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="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <stringbundle id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
     <groupbox flex="1">
         <caption label="&staff.circ.offline_checkin.main.label;"/>
index a66f3df..9745dba 100644 (file)
@@ -29,7 +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="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <stringbundle id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
     <groupbox flex="1">
         <caption label="&staff.circ.offline_checkout.main.label;"/>
index 57d7d66..5ad096b 100644 (file)
@@ -29,7 +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="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <stringbundle 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 571a649..322c968 100644 (file)
@@ -29,7 +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="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <stringbundle id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
     <groupbox flex="1">
         <caption label="&staff.circ.offline_register.main.label;"/>
index 3d41709..0e4ac5a 100644 (file)
@@ -29,7 +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="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <stringbundle id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
     <groupbox flex="1">
         <caption label="&staff.circ.offline_renew.main.label;"/>
index 35f179e..2f4c822 100644 (file)
     </binding>
 
 
-       <binding id="messagecatalog">
-               <resources/>
-
-               <content>
-                       <children>
-                       </children>
-               </content>
-
-               <implementation>
-
-                       <constructor>
-                               <![CDATA[
-                try {
-                        this._load_sprintf();
-                        this._props = {};
-                        this._load_from_src();
-                } catch(E) {
-                    alert('Error constructing messagecatalog in bindings.xml: ' + E);
-                    throw(E);
-                }
-                               ]]>
-                       </constructor>
-
-                       <property name="src">
-                               <getter>
-                                       <![CDATA[
-                    try {
-                                       return this.getAttribute('src');
-                    } catch(E) {
-                        alert('Error getting @src in messagecatalog in bindings.xml: ' + E);
-                        throw(E);
-                    }
-                                       ]]>
-                               </getter>
-                               <setter>
-                                       <![CDATA[
-                    try {
-                                           this.setAttribute('src',val);
-                                       this.load_from_src();
-                                       return val;
-                    } catch(E) {
-                        alert('Error setting @src in messagecatalog in bindings.xml: ' + E);
-                        throw(E);
-                    }
-                                       ]]>
-                               </setter>
-                       </property>
-
-                       <method name="_load_from_src">
-                               <body>
-                                       <![CDATA[
-                    try {
-                            var x = new XMLHttpRequest();
-                            x.open("GET",this.src,false);
-                            x.send(null);
-                            if ((x.status == 0 || x.status == 200) && x.responseText) {
-                                var props = this._props2object(x.responseText);
-                                for (var i in props) {
-                                    this._props[i] = props[i];
-                                }
-                            } else {
-                                var msg = "messageCatalog: No text from " + this.src;
-                                alert(msg); throw(msg);
-                            }
-                           
-                            try { // fail silently if no custom properties file exists
-                                var custom_src = String(this.src).replace(/\.properties$/,'_custom.properties'); 
-                                var x2 = new XMLHttpRequest();
-                                x2.open("GET",custom_src,false);
-                                x2.send(null);
-                                if ((x2.status == 0 || x2.status == 200) && x2.responseText) {
-                                    var props = this._props2object(x2.responseText);
-                                    for (var i in props) {
-                                        this._props[i] = props[i];
-                                    }
-                                }
-                            } catch(EE) {}
-
-                    } catch(E) {
-                        alert('Error loading properties in messagecatalog in bindings.xml: ' + E);
-                        throw(E);
-                    }
-                                       ]]>
-                               </body>
-                       </method>
-
-                       <method name="_props2object">
-                               <parameter name="str"/>
-                               <body>
-                                       <![CDATA[
-                        try {
-                            var lines = str.split("\n");
-                            var props = {};
-                            var line = '';
-                            var in_comment = false;
-
-                            for (var l in lines) {
-                                line += lines[l];
-
-                                // handle multi-line comments
-                                if (line.indexOf('/*') >= 0) in_comment = true;
-
-                                if (in_comment && line.indexOf('*/') > 0) {
-                                    var comment_start = line.indexOf('/*');
-                                    var comment_end = line.indexOf('*/');
-                                    line = line.substring(0, comment_start) + line.substring(0, comment_end + 2);
-                                    in_comment = false;
-                                } else if (in_comment) continue;
-                                    
-                                // get rid of entire-line comments
-                                if (line.indexOf('#') == 0) {
-                                    line = '';
-                                    continue;
-                                }
-
-                                // handle end-of-line comments
-                                var end_comment = line.indexOf('//');
-                                if (end_comment >= 0) line = line.substring(0, end_comment);
-
-                                // and line concatenation
-                                if (line.charAt(line.length - 1) == '\\') {
-                                    line = line.substring(0,line.length - 1);
-                                    continue;
-                                }
-
-                                var eq_pos = line.indexOf('=');
-                                if (eq_pos < 0) continue;
-
-                                var k = line.substring(0,eq_pos);
-                                k = k.replace(/\s+/g,"");
-
-                                var v = line.substring(eq_pos + 1);
-
-                                var current_m = 0;
-                                var cont = false;
-                                do {    
-                                    if (v.indexOf( "{" + current_m + "}" ) >= 0 ) {
-                                        var mes_bund = new RegExp( "\\\{" + current_m + "\\\}", 'g' );
-                                        var sprintf_format = "%" + (current_m + 1) + "$s";
-
-                                        v = v.replace( mes_bund, sprintf_format );
-
-                                        cont = true;
-                                        current_m++;
-                                    } else {
-                                        cont = false;
-                                    }
-                                } while ( cont == true );
-
-                                props[k] = v;
-                                line = '';
-                                }
-
-                            return props;
-                        } catch(E) {
-                            alert('Error in props2object in messagecatalog in bindings.xml: ' + E);
-                            throw(E);
-                        }
-                                       ]]>
-                               </body>
-                       </method>
-
-                       <method name="testString">
-                               <parameter name="key"/>
-                               <body>
-                                       <![CDATA[
-                                               try {
-                            var str = this._props[key];
-                            return (typeof str != 'undefined');
-                                               } catch(e) {
-                            return false;
-                                               }
-                                       ]]>
-                               </body>
-                       </method>
-
-
-                       <method name="getString">
-                               <parameter name="key"/>
-                               <body>
-                                       <![CDATA[
-                                               try {
-                            var str = this._props[key];
-                            if (typeof str == 'undefined') throw(str);
-                                                       return str;
-                                               } catch(e) {
-                                                       alert("*** Failed to get string " + key + " in bundle: " + this.src + "\n" + e);
-                                                       throw(e);
-                                               }
-                                       ]]>
-                               </body>
-                       </method>
-
-                       <method name="getFormattedString">
-                               <parameter name="key"/>
-                               <parameter name="params"/>
-                               <body>
-                                       <![CDATA[
-                                               try {
-                                                       var str = this._props[key]; 
-                            if (typeof str == 'undefined') throw(str);
-                                                       var these = [ str ].concat(params);
-                                                       var v = this.sprintf.apply(this,these);
-
-                                                       // replace unicode escapes
-/*
-                                                       v = v.replace(
-                                                               /\\u([0-9a-f]{4})/gi,
-                                                               function (r,s) { return String.fromCharCode(s); }
-                                                       );
-*/
-
-                                                       return v;
-                                               } catch(e) {
-                                                       alert("*** Failed to get string " + key + " in bundle: " + this.src + "\n");
-                                                       throw(e);
-                                               }
-                                       ]]>
-                               </body>
-                       </method>
-
-                       <method name="_load_sprintf">
-                               <body>
-                                       <![CDATA[
-                                       try { 
-                                               this.sprintf = function() {
-                                                               // FIXME - is the following license GPL-compatible? seems equivalent to the public domain
-                                                               /**
-                                                                * JavaScript printf/sprintf functions.
-                                                                *
-                                                                * This code is unrestricted: you are free to use it however you like.
-                                                                * 
-                                                                * The functions should work as expected, performing left or right alignment,
-                                                                * truncating strings, outputting numbers with a required precision etc.
-                                                                *
-                                                                * For complex cases, these functions follow the Perl implementations of
-                                                                * (s)printf, allowing arguments to be passed out-of-order, and to set the
-                                                                * precision or length of the output based on arguments instead of fixed
-                                                                * numbers.
-                                                                *
-                                                                * See http://perldoc.perl.org/functions/sprintf.html for more information.
-                                                                *
-                                                                * Implemented:
-                                                                * - zero and space-padding
-                                                                * - right and left-alignment,
-                                                                * - base X prefix (binary, octal and hex)
-                                                                * - positive number prefix
-                                                                * - (minimum) width
-                                                                * - precision / truncation / maximum width
-                                                                * - out of order arguments
-                                                                *
-                                                                * Not implemented (yet):
-                                                                * - vector flag
-                                                                * - size (bytes, words, long-words etc.)
-                                                                * 
-                                                                * Will not implement:
-                                                                * - %n or %p (no pass-by-reference in JavaScript)
-                                                                *
-                                                                * @version 2007.04.27
-                                                                * @author Ash Searle
-                                                                */
-
-                                                       function pad(str, len, chr, leftJustify) {
-                                                       var padding = (str.length >= len) ? '' : Array(1 + len - str.length >>> 0).join(chr);
-                                                       return leftJustify ? str + padding : padding + str;
-
-                                                       }
-
-                                                       function justify(value, prefix, leftJustify, minWidth, zeroPad) {
-                                                       var diff = minWidth - value.length;
-                                                       if (diff > 0) {
-                                                               if (leftJustify || !zeroPad) {
-                                                               value = pad(value, minWidth, ' ', leftJustify);
-                                                               } else {
-                                                               value = value.slice(0, prefix.length) + pad('', diff, '0', true) + value.slice(prefix.length);
-                                                               }
-                                                       }
-                                                       return value;
-                                                       }
-
-                                                       function formatBaseX(value, base, prefix, leftJustify, minWidth, precision, zeroPad) {
-                                                       // Note: casts negative numbers to positive ones
-                                                       var number = value >>> 0;
-                                                       prefix = prefix && number && {'2': '0b', '8': '0', '16': '0x'}[base] || '';
-                                                       value = prefix + pad(number.toString(base), precision || 0, '0', false);
-                                                       return justify(value, prefix, leftJustify, minWidth, zeroPad);
-                                                       }
-
-                                                       function formatString(value, leftJustify, minWidth, precision, zeroPad) {
-                                                       if (precision != null) {
-                                                               value = value.slice(0, precision);
-                                                       }
-                                                       return justify(value, '', leftJustify, minWidth, zeroPad);
-                                                       }
-
-                                                       var a = arguments, i = 0, format = a[i++];
-                                                       return format.replace(/%%|%(\d+\$)?([-+#0 ]*)(\*\d+\$|\*|\d+)?(\.(\*\d+\$|\*|\d+))?([scboxXuidfegEGS])/g, function(substring, valueIndex, flags, minWidth, _, precision, type) {
-                                                               if (substring == '%%') return '%';
-
-                                                               // parse flags
-                                                               var leftJustify = false, positivePrefix = '', zeroPad = false, prefixBaseX = false;
-                                                               for (var j = 0; flags && j < flags.length; j++) switch (flags.charAt(j)) {
-                                                               case ' ': positivePrefix = ' '; break;
-                                                               case '+': positivePrefix = '+'; break;
-                                                               case '-': leftJustify = true; break;
-                                                               case '0': zeroPad = true; break;
-                                                               case '#': prefixBaseX = true; break;
-                                                               }
-
-                                                               // parameters may be null, undefined, empty-string or real valued
-                                                               // we want to ignore null, undefined and empty-string values
-
-                                                               if (!minWidth) {
-                                                               minWidth = 0;
-                                                               } else if (minWidth == '*') {
-                                                               minWidth = +a[i++];
-                                                               } else if (minWidth.charAt(0) == '*') {
-                                                               minWidth = +a[minWidth.slice(1, -1)];
-                                                               } else {
-                                                               minWidth = +minWidth;
-                                                               }
-
-                                                               // Note: undocumented perl feature:
-                                                               if (minWidth < 0) {
-                                                               minWidth = -minWidth;
-                                                               leftJustify = true;
-                                                               }
-
-                                                               if (!isFinite(minWidth)) {
-                                                               throw new Error('sprintf: (minimum-)width must be finite');
-                                                               }
-
-                                                               if (!precision) {
-                                                               precision = 'fFeE'.indexOf(type) > -1 ? 6 : (type == 'd') ? 0 : void(0);
-                                                               } else if (precision == '*') {
-                                                               precision = +a[i++];
-                                                               } else if (precision.charAt(0) == '*') {
-                                                               precision = +a[precision.slice(1, -1)];
-                                                               } else {
-                                                               precision = +precision;
-                                                               }
-
-                                                               // grab value using valueIndex if required?
-                                                               var value = valueIndex ? a[valueIndex.slice(0, -1)] : a[i++];
-
-                                                               switch (type) {
-                                                               case 'S':
-                                                               case 's': return formatString(String(value), leftJustify, minWidth, precision, zeroPad);
-                                                               case 'c': return formatString(String.fromCharCode(+value), leftJustify, minWidth, precision, zeroPad);
-                                                               case 'b': return formatBaseX(value, 2, prefixBaseX, leftJustify, minWidth, precision, zeroPad);
-                                                               case 'o': return formatBaseX(value, 8, prefixBaseX, leftJustify, minWidth, precision, zeroPad);
-                                                               case 'x': return formatBaseX(value, 16, prefixBaseX, leftJustify, minWidth, precision, zeroPad);
-                                                               case 'X': return formatBaseX(value, 16, prefixBaseX, leftJustify, minWidth, precision, zeroPad).toUpperCase();
-                                                               case 'u': return formatBaseX(value, 10, prefixBaseX, leftJustify, minWidth, precision, zeroPad);
-                                                               case 'i':
-                                                               case 'd': {
-                                                                                 var number = parseInt(+value);
-                                                                                 var prefix = number < 0 ? '-' : positivePrefix;
-                                                                                 value = prefix + pad(String(Math.abs(number)), precision, '0', false);
-                                                                                 return justify(value, prefix, leftJustify, minWidth, zeroPad);
-                                                                         }
-                                                               case 'e':
-                                                               case 'E':
-                                                               case 'f':
-                                                               case 'F':
-                                                               case 'g':
-                                                               case 'G':
-                                                                                 {
-                                                                                 var number = +value;
-                                                                                 var prefix = number < 0 ? '-' : positivePrefix;
-                                                                                 var method = ['toExponential', 'toFixed', 'toPrecision']['efg'.indexOf(type.toLowerCase())];
-                                                                                 var textTransform = ['toString', 'toUpperCase']['eEfFgG'.indexOf(type) % 2];
-                                                                                 value = prefix + Math.abs(number)[method](precision);
-                                                                                 return justify(value, prefix, leftJustify, minWidth, zeroPad)[textTransform]();
-                                                                         }
-                                                               default: return substring;
-                                                               }
-                                                               });
-                                               }
-                                       } catch(e) {
-                                               alert("*** Failed to load sprintf library: " + e + "\n");
-                                               throw(e);
-                                       }
-                                       ]]>
-                               </body>
-                       </method>
-               </implementation>
-       </binding>
-
        <binding id="caption" extends="chrome://global/content/bindings/general.xml#basetext">
                <resources>
                        <stylesheet src="chrome://global/skin/groupbox.css"/>
index a86b642..4a49f34 100644 (file)
@@ -604,7 +604,7 @@ function main_init() {
             }
         }
 
-        window.document.title = authStrings.getFormattedString('staff.auth.titlebar.label', CLIENT_VERSION);
+        window.document.title = authStrings.getFormattedString('staff.auth.titlebar.label', [CLIENT_VERSION]);
         var x = document.getElementById('about_btn');
         x.addEventListener(
             'command',
index 1ba8226..fba9a75 100644 (file)
@@ -59,8 +59,8 @@
     <script type="application/x-javascript" src="chrome://inspector/content/hooks.js"/>
     <script type="application/x-javascript" src="chrome://chromelist/content/overlay/ChromeListOverlay.js" />
 
-    <messagecatalog id="authStrings" src="chrome://open_ils_staff_client/locale/auth.properties"/>
-    <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <stringbundle id="authStrings" src="chrome://open_ils_staff_client/locale/auth.properties"/>
+    <stringbundle id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
     <commandset id="auth_cmds">
         <command id="cmd_login" />
index 9c5174f..e2c94ba 100644 (file)
@@ -128,9 +128,9 @@ main.menu.prototype = {
         for(var i = 0; i < hotkeysets.length; i++) {
             var keysetname = hotkeysets[i];
             var menuitem = document.createElement('menuitem');
-            if(offlineStrings.testString('hotkey.' + keysetname))
-                menuitem.setAttribute('label',offlineStrings.getString('hotkey.' + keysetname));
-            else
+            //if(offlineStrings.testString('hotkey.' + keysetname))
+                //menuitem.setAttribute('label',offlineStrings.getString('hotkey.' + keysetname));
+            //else
                 menuitem.setAttribute('label',keysetname);
             menuitem.setAttribute('value',keysetname);
             menuitem.setAttribute('type','radio');
@@ -1905,9 +1905,9 @@ main.menu.prototype = {
             var tab = this.controller.view.tabs.childNodes[i];
             tab.curindex = i;
             tab.label = i + ' ' + tab.origlabel;
-            if(doAccessKeys && offlineStrings.testString('menu.tab' + i + '.accesskey')) {
-                tab.accessKey = offlineStrings.getString('menu.tab' + i + '.accesskey');
-            }
+            //if(doAccessKeys && offlineStrings.testString('menu.tab' + i + '.accesskey')) {
+             //   tab.accessKey = offlineStrings.getString('menu.tab' + i + '.accesskey');
+            //}
         }
     },
 
@@ -1960,9 +1960,9 @@ main.menu.prototype = {
         this.controller.view.panels.appendChild(panel);
         tab.curindex = this.controller.view.tabs.childNodes.length - 1;
         if(!xulG.pref.getBoolPref('open-ils.disable_accesskeys_on_tabs')) {
-            if(offlineStrings.testString('menu.tab' + tab.curindex + '.accesskey')) {
-                tab.accessKey = offlineStrings.getString('menu.tab' + tab.curindex + '.accesskey');
-            }
+            //if(offlineStrings.testString('menu.tab' + tab.curindex + '.accesskey')) {
+                //tab.accessKey = offlineStrings.getString('menu.tab' + tab.curindex + '.accesskey');
+            //}
         }
         var tabs = this.controller.view.tabs;
         tab.addEventListener(
@@ -2619,7 +2619,7 @@ commands:
 
                 // If we have more than one context this should label each entry with where it came from
                 // Likely most useful for distinguishing assets from bookings
-                if(context != valid_r[i].type && offlineStrings.testString('barcode_choice.' + valid_r[i].type + '_label'))
+                if(context != valid_r[i].type && offlineStrings.getString('barcode_choice.' + valid_r[i].type + '_label'))
                     button_label = offlineStrings.getFormattedString('barcode_choice.' + valid_r[i].type + '_label', [button_label]);
 
                 xml += '<button label="' + button_label + '" name="fancy_submit" value="' + i + '"/>';
index 664366c..9df0348 100644 (file)
     ]]>
     </script>
 
-    <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties" />    
+    <stringbundle id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties" />    
 
     <commandset id="universal_cmds" />
 
index 9588022..433efaf 100644 (file)
     <toolbar id="toolbar_main" hidden="true"/>
     <toolbarpallete id="palette" hidden="true"/>
 </toolbox>
+<script>dump('done loading menu_frame_overlay.xul\n');</script>
 
 </overlay>
index b505d7d..1bc5b43 100644 (file)
@@ -2,14 +2,14 @@ staff.auth.controller.not_configured=Not yet configured for the specified server
 staff.auth.controller.testing_hostname=Testing hostname...
 staff.auth.controller.prompt_hostname=Please enter a server hostname.
 staff.auth.controller.error_hostname=There was an error testing this hostname.
-staff.auth.controller.status=%1$s : %2$s
+staff.auth.controller.status=%1$S : %2$S
 staff.auth.controller.testing_version=Testing version...
 staff.auth.controller.error_version=There was an error checking version support.
 staff.auth.controller.version_mismatch=This server does not support your version of the staff client.  Please check with your system administrator.
 # login with <username> and <password> at <server>
-staff.auth.controller.error_login=login with %1$s and %2$s at %3$s
+staff.auth.controller.error_login=login with %1$S and %2$S at %3$S
 staff.auth.controller.confirm_close=Are you sure you would like to exit the program completely?
-staff.auth.session.unregistered=%1$s is not registered with this server.
+staff.auth.session.unregistered=%1$S is not registered with this server.
 staff.auth.session.login_failed=Login failed.  Please check your Server Hostname, Username, Password, and your CAPS LOCK key.
 staff.auth.session.init_false=open-ils.auth.authenticate.init returned false
-staff.auth.titlebar.label=Evergreen Staff Client - %1$s
+staff.auth.titlebar.label=Evergreen Staff Client - %1$S
index 2405b95..46c0a22 100644 (file)
@@ -1,4 +1,4 @@
-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.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.ok.label=Ok
@@ -9,24 +9,24 @@ common.clear=Clear
 common.confirm=Check here to confirm this message.
 common.error.default=Please report that this happened.
 common.error.copy_msg=Copy Message
-common.barcode.status.warning=Warning: As of %1$s, this barcode (%2$s) was flagged %3$s.
+common.barcode.status.warning=Warning: As of %1$S, this barcode (%2$S) was flagged %3$S.
 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.barcode.status.warning.unknown=with an unknown code: %1$S
 common.date.invalid=Invalid Date
 common.no=No
 common.no.accesskey=N
 common.yes=Yes
 common.yes.accesskey=Y
 common.unimplemented=Not Yet Implemented
-cat.bib_record=Bib Record: %1$s
-serial.delete_record.confirm=Are you sure you want to delete MFHD record #%1$s?
-cat.opac.delete_record.confirm=Are you sure you want to delete title record #%1$s from the catalog?
+cat.bib_record=Bib Record: %1$S
+serial.delete_record.confirm=Are you sure you want to delete MFHD record #%1$S?
+cat.opac.delete_record.confirm=Are you sure you want to delete title record #%1$S from the catalog?
 cat.opac.delete_record=Delete Record
 cat.opac.delete=Delete
-cat.opac.undelete_record.confirm=Are you sure you want to undelete title record #%1$s from the catalog?
+cat.opac.undelete_record.confirm=Are you sure you want to undelete title record #%1$S from the catalog?
 cat.opac.undelete_record=Undelete Record
 cat.opac.undelete=Undelete
 cat.opac.cancel=Cancel
@@ -35,17 +35,17 @@ cat.opac.record_deleted.confirm=Check here to confirm this action.
 cat.opac.record_undeleted=Record undeleted.
 cat.opac.record_undeleted.confirm=Check here to confirm this action.
 # variables: document ID, error code, error description
-cat.opac.record_deleted.error=Error deleting record #%1$s : %2$s : %3$s
+cat.opac.record_deleted.error=Error deleting record #%1$S : %2$S : %3$S
 # variables: document ID, error code, error description
-cat.opac.record_undeleted.error=Error undeleting record #%1$s : %2$s : %3$s
-cat.opac.record_marked_for_overlay.record_id.alert=Record with ID %1$s marked for overlay.
-cat.opac.record_marked_for_overlay.tcn.alert=Record with TCN %1$s marked for overlay.
-cat.opac.record_marked_for_multi_home.record_id.alert=Record with ID %1$s targeted for Multi-Bib items.
-cat.opac.record_marked_for_multi_home.tcn.alert=Record with TCN %1$s targeted for Mutli-Bib items.
+cat.opac.record_undeleted.error=Error undeleting record #%1$S : %2$S : %3$S
+cat.opac.record_marked_for_overlay.record_id.alert=Record with ID %1$S marked for overlay.
+cat.opac.record_marked_for_overlay.tcn.alert=Record with TCN %1$S marked for overlay.
+cat.opac.record_marked_for_multi_home.record_id.alert=Record with ID %1$S targeted for Multi-Bib items.
+cat.opac.record_marked_for_multi_home.tcn.alert=Record with TCN %1$S targeted for Mutli-Bib items.
 cat.opac.clear_statusbar=Un-target/un-mark this record?
 cat.save_record=Save Record
 cat.save.failure=Record not likely updated.
-cat.record.counter=Record %1$s of %2$s
+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
@@ -58,11 +58,11 @@ circ.duplicate_scan.field=Duplicate Scan
 circ.offline_checkout.nonbarcoded=or choose a non-barcoded option...
 circ.offline_checkout.items=Enter the number of items:
 circ.offline_checkout.download.warning=WARNING: The non-barcode types have not been downloaded from the server.  You should log in to retrieve these.
-circ.offline_checkout.barcode.flagged.lost=Warning: As of %1$s, this barcode (%2$s) was flagged Lost.
-circ.offline_checkout.barcode.flagged.expired=Warning: As of %1$s, this barcode (%2$s) was flagged Expired.
-circ.offline_checkout.barcode.flagged.barred=Warning: As of %1$s, this barcode (%2$s) was flagged Barred.
-circ.offline_checkout.barcode.flagged.blocked=Warning: As of %1$s, this barcode (%2$s) was flagged Blocked.
-circ.offline_checkout.barcode.flagged.unknown=Warning: As of %1$s, this barcode (%2$s) was flagged with an unknown code: %3$s.
+circ.offline_checkout.barcode.flagged.lost=Warning: As of %1$S, this barcode (%2$S) was flagged Lost.
+circ.offline_checkout.barcode.flagged.expired=Warning: As of %1$S, this barcode (%2$S) was flagged Expired.
+circ.offline_checkout.barcode.flagged.barred=Warning: As of %1$S, this barcode (%2$S) was flagged Barred.
+circ.offline_checkout.barcode.flagged.blocked=Warning: As of %1$S, this barcode (%2$S) was flagged Blocked.
+circ.offline_checkout.barcode.flagged.unknown=Warning: As of %1$S, this barcode (%2$S) was flagged with an unknown code: %3$S.
 circ.offline_checkout.date.early=Due date needs to be after today.
 circ.offline_checkout.required_field=Required Field
 circ.offline_checkout.valid_count=Please try again and enter a valid count.
@@ -90,20 +90,20 @@ circ.offline_register.missing.profile.list=Missing profile list.
 circ.offline_register.missing.id.type.list=Missing identification type list.
 circ.offline_register.missing.required.surveys=Missing required surveys.
 circ.offline_register.missing.files.error=ERROR: Offline patron registration requires some server-generated files.  Please login periodically to retrieve these files.
-jsan.file_not_found.error=File not found: %1$s
-jsan.namespace.creation.error=Could not create namespace[%1$s]: %2$s
+jsan.file_not_found.error=File not found: %1$S
+jsan.namespace.creation.error=Could not create namespace[%1$S]: %2$S
 menu.cmd_edit_copy_buckets.tab=Copy Buckets
 menu.cmd_edit_volume_buckets.tab=Volume Buckets
 menu.cmd_edit_record_buckets.tab=Record Buckets
 menu.cmd_edit_user_buckets.tab=User Buckets
 menu.cmd_replace_barcode.prompt=Enter original barcode for the item:
 menu.cmd_replace_barcode.label=Replace Barcode
-menu.cmd_replace_barcode.retrieval.error=We were unable to retrieve an item with barcode "%1$s".
+menu.cmd_replace_barcode.retrieval.error=We were unable to retrieve an item with barcode "%1$S".
 menu.cmd_replace_barcode.replacement.prompt=Enter the replacement barcode for the item:
 menu.cmd_replace_barcode.replacement.label=Replace Barcode
 menu.cmd_replace_barcode.blank.error=Rename aborted.  Blank for barcode not allowed.
-menu.cmd_replace_barcode.duplicate.error=Rename aborted.  Another copy has barcode "%1$s".
-menu.cmd_replace_barcode.testing.error=Error testing replacement barcode "%1$s".
+menu.cmd_replace_barcode.duplicate.error=Rename aborted.  Another copy has barcode "%1$S".
+menu.cmd_replace_barcode.testing.error=Error testing replacement barcode "%1$S".
 menu.cmd_replace_barcode.permission.error=Rename aborted.  Insufficient permission.
 menu.cmd_replace_barcode.renaming.error=Error renaming item.
 menu.cmd_replace_barcode.renaming.failure=The rename operation probably failed.
@@ -114,14 +114,14 @@ menu.cmd_search_usr_id.tab=What is the internal database ID for the patron accou
 menu.cmd_search_usr_id.prompt=Patron ID Lookup
 menu.cmd_search_tcn.tab=What is the TCN or accession ID for the record?
 menu.cmd_search_tcn.prompt=TCN Lookup
-menu.cmd_search_tcn.not_found.error="%1$s" not found
-menu.cmd_search_tcn.deleted.error="%1$s" is deleted.  Show the deleted record anyway?
+menu.cmd_search_tcn.not_found.error="%1$S" not found
+menu.cmd_search_tcn.deleted.error="%1$S" is deleted.  Show the deleted record anyway?
 menu.cmd_patron_register.related.tab=Editing Related Patron
 menu.cmd_patron_register.tab=Register Patron
 # 1 - Staff Username  2 - Patron Family  3 - Patron Barcode
-staff.circ.work_log_patron_registration.message=%1$s registered %3$s (%2$s)
+staff.circ.work_log_patron_registration.message=%1$S registered %3$S (%2$S)
 # 1 - Staff Username  2 - Patron Family  3 - Patron Barcode  4 - Hold ID  5 - Hold Type
-staff.circ.work_log_hold_placed.message=%1$s placed hold %4$s (%5$s) for %3$s (%2$s)
+staff.circ.work_log_hold_placed.message=%1$S placed hold %4$S (%5$S) for %3$S (%2$S)
 menu.cmd_browse_holds.tab=Hold Browser
 menu.cmd_browse_holds_shelf.tab=Holds Shelf
 menu.cmd_browse_hold_pull_list.tab=On Shelf Pull List
@@ -133,10 +133,10 @@ menu.cmd_retrieve_last_patron.session.error=No patron visited yet this session.
 menu.cmd_retrieve_last_record.session.error=No record visited yet this session.
 menu.cmd_retrieve_last_record.status=Retrieving title...
 menu.cmd_chg_session.label=Change Login
-menu.cmd_chg_session.operator.label=Change Operator: %1$s
+menu.cmd_chg_session.operator.label=Change Operator: %1$S
 menu.cmd_manage_offline_xacts.tab=Offline Transactions
 menu.cmd_download_patrons.complete.status=Download completed
-menu.cmd_download_patrons.error=There was a problem with the download.  The server returned a status %1$s : %2$s
+menu.cmd_download_patrons.error=There was a problem with the download.  The server returned a status %1$S : %2$S
 menu.cmd_stat_cat_edit.tab=Statistical Category Editor
 menu.cmd_non_cat_type_edit.tab=Non-Cataloged Type Editor
 menu.cmd_copy_location_edit.tab=Copy Location Editor
@@ -148,19 +148,19 @@ menu.cmd_public_opac.tab=OPAC
 menu.cmd_extension_manager.tab=Extension Manager
 menu.cmd_theme_manager.tab=Theme Manager
 menu.cmd_shutdown.prompt=Exit Evergreen completely?
-menu.spawn_search.msg=Editor would like to search for: %1$s
+menu.spawn_search.msg=Editor would like to search for: %1$S
 menu.cmd_verify_credentials.tabname=Verify Credentials
 menu.close_all_tabs.error=Error closing all tabs
 menu.new_tab.tab=Tab
 menu.new_tab.max_tab_dialog=Sorry, we can't create any more tabs in this window.\nWould you like to create a new tab in another window?
-main.session_cookie.error=Error setting session cookie: %1$s
+main.session_cookie.error=Error setting session cookie: %1$S
 menu.set_tab.error=pause for error
 menu.reset_network_stats=Reset network activity summary?
 main.testing=Testing
 main.transaction_export.title=Save Transaction File As
-main.transaction_export.prompt=Would you like to overwrite the existing file %1$s?
+main.transaction_export.prompt=Would you like to overwrite the existing file %1$S?
 main.transaction_export.prompt.title=Transaction Export Warning
-main.transaction_export.success.prompt=Your transactions have been successfully exported to file %1$s. We strongly recommend that you now purge the transactions from this staff client.  Would you like for us to do this?
+main.transaction_export.success.prompt=Your transactions have been successfully exported to file %1$S. We strongly recommend that you now purge the transactions from this staff client.  Would you like for us to do this?
 main.transaction_export.success.title=Transaction Export Successful
 main.transaction_export.filename.error=Error purging transactions:  Taking too long to find a unique filename for archival.
 main.transaction_export.duplicate.warning=Please note that you now have two sets of identical transactions.  Unless the set you just exported is solely for archival purposes, we run the risk of duplicate transactions being processed on the server.
@@ -168,45 +168,45 @@ main.transaction_export.no_filename.error=Either you did not choose a filename,
 main.transaction_export.no_transactions.error=There are no outstanding transactions to export.
 main.transaction_import.outstanding.error=There are already outstanding transactions on this staff client.  Upload these first.
 main.transaction_import.title=Import Transaction File
-main.transaction_import.delete.prompt=Your transactions have been successfully migrated to this staff client.\n\nWe recommend that you delete the external copy.  Would you like for us to delete %1$s?
+main.transaction_import.delete.prompt=Your transactions have been successfully migrated to this staff client.\n\nWe recommend that you delete the external copy.  Would you like for us to delete %1$S?
 main.transaction_import.success=Transaction Import Successful
 main.on_debug.clear_cache=cache cleared
 main.on_debug.debug=debug the debug :D
 main.new_window_btn.login_first_warning=Please login first!
 main.settings.migrate=This version of the staff client stores local settings in a different location than your previous installation.  Should we attempt to migrate these settings?
-main.settings.migrate.failed=WARNING: Unable to migrate legacy settings.  The settings and configuration files appear to exist in multiple locations. \nTo resolve this problem manually, please consider:\n\t%1$s\nwhich is in the directory where we want to store settings for the current operating system account, and:\n\t%2$s\nwhich is where we used to store such information.\n
-main.settings.migrate.confirm=Move the settings and configuration files from\n%1$s\nto\n%2$s?
-main.settings.migrate.error=Error trying to move %1$s to directory %2$s
+main.settings.migrate.failed=WARNING: Unable to migrate legacy settings.  The settings and configuration files appear to exist in multiple locations. \nTo resolve this problem manually, please consider:\n\t%1$S\nwhich is in the directory where we want to store settings for the current operating system account, and:\n\t%2$S\nwhich is where we used to store such information.\n
+main.settings.migrate.confirm=Move the settings and configuration files from\n%1$S\nto\n%2$S?
+main.settings.migrate.error=Error trying to move %1$S to directory %2$S
 network.override.exceptions=Exceptions
 network.override.override=Override 
 network.override.force.prompt=Force this action?
 network.ignore_errors=Ignore Errors
-network.method_not_found.error=Method not found for %1$s
+network.method_not_found.error=Method not found for %1$S
 network.new_session.authorize=Authorize
 network.new_session.expired=Session Expired
 network.new_session.expired.prompt=Please enter the credentials for a new login session.
 network.new_session.operator_change=Operator Change
 network.new_session.operator_change.prompt=Please enter the credentials for the new login session.  Note that the previous session is still active.
 network.permission.authorize=Authorize
-network.permission.description.brief=Permission Denied: %1$s
-network.permission.description.full=Another staff member with the above permission may authorize this specific action.  Please notify your library administrator if you need this permission.  If you feel you have received this exception in error, please inform your friendly Evergreen developers or helpdesk staff of the above permission and this debug information: %1$s
+network.permission.description.brief=Permission Denied: %1$S
+network.permission.description.full=Another staff member with the above permission may authorize this specific action.  Please notify your library administrator if you need this permission.  If you feel you have received this exception in error, please inform your friendly Evergreen developers or helpdesk staff of the above permission and this debug information: %1$S
 network.server_or_method.error=Server or method error
-network.server.failure.exception=Network or server failure.  Please check your Internet connection to %1$s and choose Retry Network.  If you need to enter Offline Mode, choose Ignore Errors in this and subsequent dialogs.  If you believe this error is due to a bug in Evergreen and not network problems, please contact your help desk or friendly Evergreen administrators, and give them this information:
-network.server.method=method=%1$s
-network.server.params=params=%1$s
+network.server.failure.exception=Network or server failure.  Please check your Internet connection to %1$S and choose Retry Network.  If you need to enter Offline Mode, choose Ignore Errors in this and subsequent dialogs.  If you believe this error is due to a bug in Evergreen and not network problems, please contact your help desk or friendly Evergreen administrators, and give them this information:
+network.server.method=method=%1$S
+network.server.params=params=%1$S
 network.server.thrown_label=THROWN:
 network.server.status_label=STATUS:
 network.network_failure=Network Failure
 network.retry_network=Retry Network
 network.unknown_status=Unknown status
 network.window_title.error=Error setting window titles to match new login
-openils.global_util.clear_cache.error=Problem clearing the cache: %1$s
-openils.global_util.clipboard.error=Clipboard action failed: %1$s
-openils.global_util.clipboard=Copied "%1$s" to clipboard.
-openils.global_util.content_window_jsobject.error=Error with get_contentWindow(%1$s) and wrappedJSObject: %2$s
-openils.global_util.content_window.error=Error with get_contentWindow(%1$s): %2$s
-openils.global_util.font_size.error=Error adjusting the font size: %1$s
-list.row_fetch_warning=WARNING: Only %1$s out of %2$s rows in this list have been retrieved for immediate viewing.  Sorting this list requires that all these rows be retrieved, and this may take some time and lag the staff client.  Would you like to proceed?
+openils.global_util.clear_cache.error=Problem clearing the cache: %1$S
+openils.global_util.clipboard.error=Clipboard action failed: %1$S
+openils.global_util.clipboard=Copied "%1$S" to clipboard.
+openils.global_util.content_window_jsobject.error=Error with get_contentWindow(%1$S) and wrappedJSObject: %2$S
+openils.global_util.content_window.error=Error with get_contentWindow(%1$S): %2$S
+openils.global_util.font_size.error=Error adjusting the font size: %1$S
+list.row_fetch_warning=WARNING: Only %1$S out of %2$S rows in this list have been retrieved for immediate viewing.  Sorting this list requires that all these rows be retrieved, and this may take some time and lag the staff client.  Would you like to proceed?
 list.columns_saved=Column configuration saved.
 list.column_save_disabled=Column configuration save disabled by server policy.
 list.row_retrieving=Retrieving...
@@ -272,23 +272,23 @@ staff.cat.util.copy_editor.batch_view=Batch View
 staff.cat.util.copy_editor.edit=Edit
 staff.cat.util.copy_editor.view=View
 staff.circ.copy_status.add_volumes.perm_failure=You do not have permission to add volumes to the workstation library.
-staff.circ.copy_status.add_volumes.title=Add Volume/Item for Record # %1$s
-staff.cat.copy_browser.marked_record_for_multi_home_indicator.tcn.label=Record with TCN %1$s targeted for Multi-Bib items.
-staff.cat.copy_browser.marked_record_for_multi_home_indicator.record_id.label=Record with ID %1$s targeted for Multi-Bib items.
-staff.cat.z3950.marked_record_for_overlay_indicator.tcn.label=Record with TCN %1$s marked for overlay.
-staff.cat.z3950.marked_record_for_overlay_indicator.record_id.label=Record with ID %1$s marked for overlay.
-staff.cat.opac.marked_record_for_hold_transfer_indicator.tcn.label=Record with TCN %1$s marked for title hold transfer.
-staff.cat.opac.marked_record_for_hold_transfer_indicator.record_id.label=Record with ID %1$s marked for title hold transfer.
+staff.circ.copy_status.add_volumes.title=Add Volume/Item for Record # %1$S
+staff.cat.copy_browser.marked_record_for_multi_home_indicator.tcn.label=Record with TCN %1$S targeted for Multi-Bib items.
+staff.cat.copy_browser.marked_record_for_multi_home_indicator.record_id.label=Record with ID %1$S targeted for Multi-Bib items.
+staff.cat.z3950.marked_record_for_overlay_indicator.tcn.label=Record with TCN %1$S marked for overlay.
+staff.cat.z3950.marked_record_for_overlay_indicator.record_id.label=Record with ID %1$S marked for overlay.
+staff.cat.opac.marked_record_for_hold_transfer_indicator.tcn.label=Record with TCN %1$S marked for title hold transfer.
+staff.cat.opac.marked_record_for_hold_transfer_indicator.record_id.label=Record with ID %1$S marked for title hold transfer.
 staff.cat.opac.title_for_hold_transfer.destination_needed.label=Need to mark a record as a Title Hold Transfer Destination first.
 staff.cat.opac.title_for_hold_transfer.success.label=Holds transferred.
 staff.cat.opac.title_for_hold_transfer.failure.label=Holds not transferred.
 staff.cat.opac.related_items=Related Lineitems
 staff.cat.opac.serial_alt_mgmt=Subscriptions
 staff.cat.create_or_rebarcode_items=Create or Re-barcode Items
-staff.cat.bib_source.can_have_copies.false=Records from %1$s cannot have copies.
+staff.cat.bib_source.can_have_copies.false=Records from %1$S cannot have copies.
 printing.nothing_to_reprint=Nothing to re-print
 printing.prompt_for_external_print_cmd=Enter external print command and parameters (use %receipt.txt% or %receipt.html% as the file containing the print data. Those values will be substituted with the proper path.):
-printing.print_strategy_saved=Print strategy (%1$s) for %2$s context saved to file system.
+printing.print_strategy_saved=Print strategy (%1$S) for %2$S context saved to file system.
 text_editor.prompt_for_external_cmd=Enter external text editor command and parameters (use %letter.txt% as the file containing the text. This value will be substituted with the proper path.):
 menu.tab1.accesskey=1
 menu.tab2.accesskey=2
@@ -309,25 +309,25 @@ menu.logoff.unsaved_data_warning=This session may have unsaved data. Logoff anyw
 menu.shutdown.unsaved_data_warning=This application may have unsaved data. Exit it anyway?
 hotkeys.Default=Default
 hotkeys.None=No Hotkeys
-barcode_choice.join_barcodes=%1$s / %2$s
-barcode_choice.actor=%1$s : %2$s, %3$s from %4$s (%5$s)
-barcode_choice.asset=%1$s : %2$s from %3$s (%4$s)
+barcode_choice.join_barcodes=%1$S / %2$S
+barcode_choice.actor=%1$S : %2$S, %3$S from %4$S (%5$S)
+barcode_choice.asset=%1$S : %2$S from %3$S (%4$S)
 barcode_choice.none=None of the above
 barcode_choice.prompt=After auto completion multiple barcodes may match your input. Please choose the barcode you intended below.
 barcode_choice.errors_found=In addition to the options below, one or more errors were encountered on items not shown.
 barcode_choice.title=Barcode Choice
 barcode_choice.choice_label=Found Barcodes:
-barcode_choice.actor_label=Patron : %1$s
-barcode_choice.asset_label=Item : %1$s
-barcode_choice.serial_label=Serial : %1$s
-barcode_choice.booking_label=Booking : %1$s
+barcode_choice.actor_label=Patron : %1$S
+barcode_choice.asset_label=Item : %1$S
+barcode_choice.serial_label=Serial : %1$S
+barcode_choice.booking_label=Booking : %1$S
 staff.main.button_bar.none=None
 staff.main.button_bar.default=Default
 util.hide_elements.title=Hide UI Elements
 util.hide_elements.desc=This is a list of hideable elements for this interface.  Check the ones that you want hidden and the library (and descendants) you want to affect:
-util.hide_elements.current_setting_preamble=Workstation library %1$s is currently hiding these elements based on a setting inherited from %2$s:
-util.hide_elements.current_setting_nonexistent=Workstation library %1$s is not currently hiding any of these elements.
+util.hide_elements.current_setting_preamble=Workstation library %1$S is currently hiding these elements based on a setting inherited from %2$S:
+util.hide_elements.current_setting_nonexistent=Workstation library %1$S is not currently hiding any of these elements.
 util.hide_elements.update_setting.update_success=Successfully updated the setting.
 util.hide_elements.update_setting.delete_success=Successfully deleted the setting.
 util.hide_elements.update_setting.failure=Setting not changed.
-util.hide_elements.missing_permission=Missing permission %1$s
+util.hide_elements.missing_permission=Missing permission %1$S
index 85e3d1f..b3e6c51 100644 (file)
@@ -16,7 +16,6 @@ iframe { background: #CDCED3 url("chrome://browser/skin/icons/box-background.png
 .operator_change { background-color: red; }
 
 .shrinkable_groupbox { font-weight: bold; -moz-binding: url('chrome://open_ils_staff_client/content/main/bindings.xml#caption'); }
-messagecatalog { -moz-binding: url('chrome://open_ils_staff_client/content/main/bindings.xml#messagecatalog'); }
 help { -moz-binding: url('chrome://open_ils_staff_client/content/main/bindings.xml#help'); }
 
 .my_overflow { overflow: auto; }
index b4b81ac..1408383 100644 (file)
@@ -86,9 +86,9 @@
             <menuitem label="&common.sort.next.ascending;" oncommand="util.sort.dispatch('next','asc');"/>
             <menuitem label="&common.sort.next.descending;" oncommand="util.sort.dispatch('next','desc');"/>
         </menupopup>
-        <messagecatalog id="commonStrings" src='/xul/server/locale/<!--#echo var="locale"-->/common.properties'/>
-        <messagecatalog id="offlineStrings" src='/xul/server/locale/<!--#echo var="locale"-->/offline.properties'/>
-        <messagecatalog id="authStrings" src='/xul/server/locale/<!--#echo var="locale"-->/auth.properties'/>
+        <stringbundle id="commonStrings" src='oils://remote/xul/server/locale/<!--#echo var="locale"-->/common.properties'/>
+        <stringbundle id="offlineStrings" src='oils://remote/xul/server/locale/<!--#echo var="locale"-->/offline.properties'/>
+        <stringbundle id="authStrings" src='oils://remote/xul/server/locale/<!--#echo var="locale"-->/auth.properties'/>
         <hbox id="debug_box" hidden="true" flex="1" style="border: red thin dashed">
             <label value="Debug:" />
             <textbox id="debug_tb" flex="1"/>
index b9664fc..1f72f51 100644 (file)
@@ -31,7 +31,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="circ_age_to_lost.js"/>
 
-    <messagecatalog id="adminStrings" src="/xul/server/locale/<!--#echo var='locale'-->/admin.properties"/>
+    <stringbundle id="adminStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/admin.properties"/>
 
     <vbox flex="1">
         <grid>
index d556207..3364cd7 100644 (file)
@@ -28,7 +28,7 @@
     </script>
     <scripts id="openils_util_scripts"/>
 
-    <messagecatalog id="adminStrings" src='/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
+    <stringbundle id="adminStrings" src='oils://remote/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
 
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="do_not_auto_attempt_print_setting.js"/>
index 78f4dd7..b558a8e 100644 (file)
     ]]>
     </script>
 
-    <messagecatalog id="adminStrings" src='/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
+    <stringbundle id="adminStrings" src='oils://remote/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
 
     <groupbox orient="vertical">
         <caption label="&staff.server.admin.font.sound.caption;"/>
index 860327f..e7707b0 100644 (file)
@@ -50,7 +50,7 @@
 
     ]]>
     </script>
-    <messagecatalog id="adminStrings" src="/xul/server/locale/<!--#echo var='locale'-->/admin.properties"/>
+    <stringbundle id="adminStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/admin.properties"/>
 
     <vbox id="admin_offline_manage_xacts_main" flex="1">
 
index 26250c7..4718a0a 100644 (file)
@@ -28,7 +28,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="patrons_due_refunds.js"/>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
     <commandset id="patrons_due_refunds_cmds">
         <command id="retrieve_patron" label="&staff.patron.display_overlay.retrieve_patron.label;" accesskey="&staff.patron.display_overlay.retrieve_patron.accesskey;" />
index e8f61ae..2861398 100644 (file)
@@ -26,7 +26,7 @@
     <script type="text/javascript" src="/xul/server/main/constants.js"></script>
     <script type="text/javascript" src="/xul/server/main/JSAN.js"></script>
     <script type="text/javascript" src="printer_settings.js"></script>
-    <messagecatalog id="offlineStrings" src="/xul/server/locale/<!--#echo var='locale'-->/offline.properties" />
+    <stringbundle id="offlineStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/offline.properties" />
     <groupbox>
         <caption label="&staff.printing.context.header;" />
         <vbox>
index 5732674..0df4934 100644 (file)
@@ -27,7 +27,7 @@
         var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;
     </script>
     <scripts id="openils_util_scripts"/>
-    <messagecatalog id="adminStrings" src='/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
+    <stringbundle id="adminStrings" src='oils://remote/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
 
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="toolbar.js"/>
index b281208..7abb718 100644 (file)
@@ -52,9 +52,9 @@
     ]]>
     </script>
 
-    <messagecatalog id="adminStrings" src='/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
-    <messagecatalog id="circStrings" src='/xul/server/locale/<!--#echo var="locale"-->/circ.properties'/>
-    <messagecatalog id="catStrings" src='/xul/server/locale/<!--#echo var="locale"-->/cat.properties'/>
+    <stringbundle id="adminStrings" src='oils://remote/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
+    <stringbundle id="circStrings" src='oils://remote/xul/server/locale/<!--#echo var="locale"-->/circ.properties'/>
+    <stringbundle id="catStrings" src='oils://remote/xul/server/locale/<!--#echo var="locale"-->/cat.properties'/>
 
     <vbox flex="1" class="my_overflow">
         <hbox>
index 0bcfc67..b59e29a 100644 (file)
@@ -27,7 +27,7 @@
         var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;
     </script>
     <scripts id="openils_util_scripts"/>
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="work_log.js"/>
index 0f527d6..8d393b0 100644 (file)
@@ -277,12 +277,12 @@ function dynamic_grid_replacement(mode) {
             label.setAttribute('control',name);
             label.setAttribute('class','emphasis');
             label.setAttribute('value',
-                catStrings.testString('staff.cat.bib_brief.'+name+'.label')
+                (typeof catStrings.getString('staff.cat.bib_brief.'+name+'.label') != 'undefined')
                 ? catStrings.getString('staff.cat.bib_brief.'+name+'.label')
                 : name
             );
             label.setAttribute('accesskey',
-                catStrings.testString('staff.cat.bib_brief.'+name+'.accesskey')
+                (typeof catStrings.getString('staff.cat.bib_brief.'+name+'.accesskey') != 'undefined')
                 ? catStrings.getString('staff.cat.bib_brief.'+name+'.accesskey')
                 : name
             );
index 3ce8e8f..d36815d 100644 (file)
@@ -35,8 +35,8 @@ vim: noet:sw=4:ts=4:
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="/xul/server/cat/bib_brief.js"/>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
 
     <groupbox id="groupbox" flex="1" style="overflow: auto;">
         <caption id="caption">
index 34f7cbe..87ccee6 100644 (file)
@@ -35,8 +35,8 @@ vim: noet:sw=4:ts=4:
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="/xul/server/cat/bib_brief.js"/>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
 
     <groupbox id="groupbox" flex="1">
         <caption id="caption"><label value="&staff.cat.bib_brief.record_summary;"/>(<label value="&staff.cat.bib_brief.view_marc;" class="click_link" onclick="view_marc();"/>)</caption>
index 51ee003..db2a72c 100644 (file)
@@ -65,8 +65,8 @@ vim:noet:sw=4:ts=4:
     ]]>
     </script>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <commandset id="cat_copy_browser">
         <command id="save_columns" />
index 1c4d25e..f9cd036 100644 (file)
@@ -72,8 +72,8 @@
     ]]>
     </script>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
 
     <commandset id="copy_buckets_cmds">
         <command id="cmd_copy_bucket_submit_barcode" />
index 4d5894f..16740df 100644 (file)
     ]]>
     </script>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <vbox flex="1" style="overflow: auto">
     <groupbox flex="1">
index 1e826c2..5f4c65e 100644 (file)
@@ -94,7 +94,6 @@ function my_init() {
 
         /******************************************************************************************************/
         /* Quick fix, this was defined inline in the global scope but now needs g.error and g.copies from my_init */
-        /* Quick fix, messagecatalog only usable during/after onload */
 
         init_panes0();
         init_panes();
index b72d537..5161d3d 100644 (file)
@@ -33,7 +33,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="copy_editor.js"/>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 
     <vbox id="brief_display_box"/>
 
index a71f436..55b6b9a 100644 (file)
     ]]>
     </script>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <stack hidden="true" id="note_template" flex="1">
         <groupbox flex="1" style="background-color: black;"/>
index 3bc5723..cbff6d5 100644 (file)
     ]]>
     </script>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <groupbox id="groupbox" flex="1" style="overflow: none; min-height: 80;">
         <caption label="&staff.cat.copy_summary.label;" id="caption"/>
index fa73926..28eee35 100644 (file)
@@ -29,8 +29,8 @@
     </script>
     <scripts id="openils_util_scripts"/>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="manage_multi_home_items.js"/>
index ae5d3d2..87b41e4 100644 (file)
     ]]>
     </script>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <vbox id="marc_editor_box" flex="1">
         <hbox id="actions">
index 90b42e8..f176052 100644 (file)
@@ -75,7 +75,7 @@ vim:noet:sw=4:ts=4:
     ]]>
     </script>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
 
     <groupbox flex="1">
         <caption label="&staff.cat.marc_view.title;"/>
index 8f1fcf5..f81c970 100644 (file)
@@ -1,4 +1,3 @@
-messagecatalog { -moz-binding: url('../main/bindings.xml#messagecatalog'); }
 input {
     background-color: lightgrey;
 }
index 0519d06..dcf6a6a 100644 (file)
@@ -18,8 +18,8 @@
 
 <script src="marcedit.js" type="application/x-javascript; e4x=1"/>
 
-<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+<stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+<stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
 <groupbox flex="0">
     <caption label="&staff.cat.marcedit.options.label;"/>
index 2682425..8b90724 100644 (file)
@@ -81,8 +81,8 @@
     ]]>
     </script>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
 
     <commandset id="record_buckets_cmds" />
 
index 2ea4cdb..614afd4 100644 (file)
@@ -7,8 +7,8 @@
 
 <script>dump('loading record_buckets_overlay.xul\n');</script>
 
-<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+<stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+<stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
 <commandset id="record_buckets_cmds">
     <command id="sel_clip0" disabled="true"/>
index 72264b7..73fe9a7 100644 (file)
     ]]>
     </script>
     
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <vbox flex="1" style="overflow: auto">
     <groupbox flex="1">
index 3839704..751f34f 100644 (file)
@@ -30,8 +30,8 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="/xul/server/cat/spine_labels.js"/>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 
     <vbox id="spine_labels_main" flex="1" class="my_overflow">
         <hbox flex="1" class="my_overflow">
index 59c1f54..e3c1cd6 100644 (file)
@@ -53,8 +53,8 @@
     ]]>
     </script>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
     
     <label value="Just a stub, Not Yet Implemented"/>
 
index 5cfc111..fcf5346 100644 (file)
@@ -33,8 +33,8 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="volume_copy_creator.js"/>
     
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
 <vbox flex="1" class="my_overflow">
     <vbox id="summary_box" oils_persist="height"/>
index ec03b1a..3a87bb3 100644 (file)
@@ -28,7 +28,7 @@
     </script>
     <scripts id="openils_util_scripts"/>
 
-    <messagecatalog id="catStrings" src='/xul/server/locale/<!--#echo var="locale"-->/cat.properties'/>
+    <stringbundle id="catStrings" src='oils://remote/xul/server/locale/<!--#echo var="locale"-->/cat.properties'/>
 
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="volume_copy_editor.js"/>
index 33d856c..3699354 100644 (file)
@@ -33,8 +33,8 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="volume_editor.js"/>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <groupbox flex="1" style="overflow: auto">
         <caption id="caption" label="&staff.cat.volume_editor.caption.label;"/>
index cf78b11..b897176 100644 (file)
@@ -330,7 +330,7 @@ cat.z3950.prototype = {
                                                         }
                                                         if (attr.label) {
                                                             attrs[i].labels[ attr.label ] = true;
-                                                        } else if (document.getElementById('commonStrings').testString('staff.z39_50.search_class.' + i)) {
+                                                        } else if (typeof document.getElementById('commonStrings').getString('staff.z39_50.search_class.' + i) != 'undefined') {
                                                             attrs[i].labels[ document.getElementById('commonStrings').getString('staff.z39_50.search_class.' + i) ] = true;
                                                         } else if (attr.name) {
                                                             attrs[i].labels[ attr.name ] = true;
index 7c02ef4..b553e05 100644 (file)
@@ -74,8 +74,8 @@
     ]]>
     </script>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
-     <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
+     <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 
     <commandset id="cat_z3950_cmds">
         <command id="cmd_broken" />
index 7d39fd9..f01fb7e 100644 (file)
@@ -33,8 +33,8 @@
     <script type="text/javascript" src="/xul/server/cat/bib_brief.js"/>
     <script type="text/javascript" src="alternate_copy_summary.js"/>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
 
     <groupbox flex="1">
 
index 81cdec0..98bde73 100644 (file)
@@ -31,7 +31,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="backdate_post_checkin.js"/>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
     <!-- CONTENT -->
index 1910e01..5fca000 100644 (file)
@@ -77,8 +77,8 @@
 
     <commandset id="checkin_cmds" />
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
 
     <box id="checkin_main" />
 
index 75c8a55..d69c63b 100644 (file)
@@ -80,7 +80,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <commandset id="checkout_cmds">
         <command id="cmd_checkout_submit" />
index 0b07021..4cc57b6 100644 (file)
     ]]>
     </script>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <groupbox id="gb" flex="1" style="overflow: auto;">
         <caption id="caption"/>
index 3cc45c2..3c6a0a1 100644 (file)
     ]]>
     </script>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <vbox flex="1" style="overflow: auto;">
         <vbox id="top_box" flex="1" style="border: none; overflow: none; min-height: 80;" oils_persist="height"/>
index 89610e3..08d57dc 100644 (file)
     ]]>
     </script>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 
     <commandset id="copy_status_cmds">
         <command id="cmd_copy_status_submit_barcode" />
index 097aeb7..f626bef 100644 (file)
@@ -65,7 +65,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <commandset id="in_house_use_cmds">
         <command id="sel_clip" disabled="true" />
index 6991013..de60355 100644 (file)
@@ -28,8 +28,8 @@
     </script>
     <scripts id="openils_util_scripts"/>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="missing_pieces.js"/>
index 046f2b2..837857a 100644 (file)
@@ -90,8 +90,8 @@
     ]]>
     </script>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 
     <groupbox flex="1" style="overflow: auto">
         <caption label="&staff.circ.pre_cat.caption.label;"/>
index f486048..9bc63a0 100644 (file)
@@ -63,7 +63,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <commandset id="print_list_cmds">
         <command id="cmd_broken" />
index 300d253..58cdcf2 100644 (file)
@@ -85,9 +85,9 @@
 
     </commandset>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <box id="renew_main" />
 
index 62aed30..00caa8d 100644 (file)
@@ -28,7 +28,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="verify_credentials.js"/>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
     <commandset id="verify_cmds">
         <command id="cmd_verify" />
index bd8f077..4cb901e 100644 (file)
     ]]>
     </script>
     
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
     <vbox flex="1" class="my_overflow">
         <groupbox orient="vertical" flex="1">
index 51167a5..a3fdebb 100644 (file)
@@ -32,9 +32,9 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="bill2.js"/>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
 
     <commandset>
         <command id="opac" label="&staff.patron.bill_interface.show_in_catalog.label;" accesskey="&staff.patron.bill_interface.show_in_catalog.accesskey;" disabled="true"/>
index 3633745..05caee9 100644 (file)
     ]]>
     </script>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
     <groupbox>
         <caption label="&staff.patron.bill_cc_info.info.label;"/>
index 71738ec..39dc5d4 100644 (file)
@@ -59,7 +59,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
     <groupbox>
         <caption label="&staff.patron.bill_check_info.check_info.label;"/>
index a16d4e7..6e12beb 100644 (file)
@@ -32,7 +32,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="bill_details.js"/>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <vbox flex="1" class="my_overflow">
         <label id="patron_name" class="patronNameLarge"/>
index 128ce1d..cce008d 100644 (file)
@@ -32,8 +32,8 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="bill_history.js"/>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
 
     <vbox flex="1" class="my_overflow">
         <groupbox orient="vertical" flex="1">
index 126f021..ad8fe8b 100644 (file)
@@ -32,7 +32,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="/xul/server/patron/bill_wizard.js"/>
     
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <vbox flex="1">
 
index e0861db..b674231 100644 (file)
@@ -85,7 +85,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <commandset id="patron_display_cmds">
         <command id="cmd_patron_refresh" />
index 1c53834..55f5134 100644 (file)
@@ -85,7 +85,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <commandset id="patron_display_cmds">
         <command id="cmd_patron_refresh" />
index d27c001..2f3ddf3 100644 (file)
@@ -31,7 +31,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="edit_standing_penalty.js"/>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
     <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
     <!-- CONTENT -->
index fb3830c..24d9a23 100644 (file)
@@ -30,7 +30,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="hold_cancel.js"/>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
     <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
     <!-- CONTENT -->
index 779b798..932b9ff 100644 (file)
@@ -30,8 +30,8 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="hold_details.js"/>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <stack hidden="true" id="notification_template" flex="1">
         <groupbox flex="1" style="background-color: black;"/>
index f7f03fc..8fc742d 100644 (file)
@@ -70,9 +70,9 @@
     ]]>
     </script>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale' -->/patron.properties"/>
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/patron.properties"/>
 
         <commandset id="holds_cmds" />
 
index 9e8777e..2a2865f 100644 (file)
@@ -30,7 +30,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="info_group.js"/>
     
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <commandset id="info_group_cmds">
         <command id="clone" 
index 133eec5..ccd706d 100644 (file)
     ]]>
     </script>
     
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <stack hidden="true" id="note_template" flex="1" minheight="50px">
         <groupbox flex="1" style="background-color: black;"/>
index 4318313..4c0280e 100644 (file)
     ]]>
     </script>
     
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <stack hidden="true" id="actsc_template" flex="1">
         <groupbox flex="1" style="background-color: black;"/>
index 66231c3..c2ebb6e 100644 (file)
     ]]>
     </script>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
     
     <stack hidden="true" id="asv_template" flex="1">
         <groupbox flex="1" style="background-color: black;"/>
index 6faf415..04cf90d 100644 (file)
@@ -63,9 +63,9 @@
     ]]>
     </script>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <commandset id="items_cmds" />
     <popupset id="items_popupset"/>
index 7e9271b..361a32b 100644 (file)
@@ -31,7 +31,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="new_standing_penalty.js"/>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
     <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
     <!-- CONTENT -->
index afa0a55..d1ce134 100644 (file)
@@ -28,8 +28,8 @@
     </script>
     <scripts id="openils_util_scripts"/>
 
-    <messagecatalog id="patronStrings"
-        src='/xul/server/locale/<!--#echo var="locale"-->/patron.properties'/>
+    <stringbundle id="patronStrings"
+        src='oils://remote/xul/server/locale/<!--#echo var="locale"-->/patron.properties'/>
 
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="place_hold.js"/>
index 43a4fde..bf53f29 100644 (file)
@@ -84,7 +84,7 @@
     ]]>
     </script>
     
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <commandset id="patron_search_form_cmds">
     </commandset>
index 4e8f6af..d7675e0 100644 (file)
@@ -84,7 +84,7 @@
     ]]>
     </script>
     
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <commandset id="patron_search_form_cmds">
     </commandset>
index 9546380..ce50b6c 100644 (file)
@@ -79,7 +79,7 @@
         <command id="cmd_save_cols" />
     </commandset>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <box id="patron_search_result_main" />
 
index f7fb70f..ecc82fb 100644 (file)
@@ -28,7 +28,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="staged.js"/>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
     <commandset id="staged_cmds">
         <command id="cmd_load" disabled="true"/>
index a1b5d90..4789acc 100644 (file)
@@ -28,7 +28,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="standing_penalties.js"/>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
     <commandset id="penalty_cmds">
         <command id="cmd_apply_penalty" />
index cee959b..5291da4 100644 (file)
     ]]>
     </script>
     
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-    <messagecatalog id="offlineStrings" src="/xul/server/locale/<!--#echo var='locale'-->/offline.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="offlineStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/offline.properties"/>
 
     <commandset id="patron_summary_cmds" />
     <popupset id="patron_summary_popups" />
index 0d9987c..0838610 100644 (file)
@@ -18,7 +18,7 @@
     onload="try { init_editor(); } catch(E) { alert(js2JSON(E)); }"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
     <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
     <script type='text/javascript' src='/opac/common/js/utils.js'/>
     <script type='text/javascript' src='/opac/common/js//config.js'/>
index 98c90f9..cd3d556 100644 (file)
@@ -24,8 +24,8 @@
         not to use it otherwise.  -->
     <script type="text/javascript" src="/xul/server/main/JSAN.js" />
 
-    <messagecatalog id="serialStrings"
-        src="/xul/server/locale/<!--#echo var='locale'-->/serial.properties" />
+    <stringbundle id="serialStrings"
+        src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/serial.properties" />
 
     <commandset />
     <box id="batch_receive_main" />
index 4e2d960..7854ed0 100644 (file)
        ]]>
        </script>
 
-       <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-       <messagecatalog id="serialStrings" src="/xul/server/locale/<!--#echo var='locale'-->/serial.properties" />
+       <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+       <stringbundle id="serialStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/serial.properties" />
 
        <stack hidden="true" id="note_template" flex="1">
                <vbox flex="1" style="background-color: black; margin:3px"/>
index 7b0469b..2d742ac 100644 (file)
@@ -25,8 +25,8 @@
         not to use it otherwise.  -->
     <script type="text/javascript" src="/xul/server/main/JSAN.js" />
 
-    <messagecatalog id="serialStrings"
-        src="/xul/server/locale/<!--#echo var='locale'-->/serial.properties" />
+    <stringbundle id="serialStrings"
+        src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/serial.properties" />
 
     <commandset />
     <box id="pattern_wizard_main" />
index 4026ae5..2676a5d 100644 (file)
@@ -83,7 +83,7 @@
        ]]>
        </script>
        
-       <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+       <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 
        <vbox flex="1" style="overflow: auto">
        <groupbox flex="1">
index 3d0cbdc..96b00aa 100644 (file)
@@ -72,7 +72,7 @@
        ]]>
        </script>
        
-       <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+       <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 
        <vbox flex="1" style="overflow: auto">
        <groupbox flex="1">
index 34b0f31..763355b 100644 (file)
@@ -39,10 +39,10 @@ vim:noet:sw=4:ts=4:
 
        <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
 
-       <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-       <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-    <messagecatalog id="serialStrings" src="/xul/server/locale/<!--#echo var='locale'-->/serial.properties"/>
+       <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+       <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="serialStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/serial.properties"/>
 
        <commandset id="serial_commands">
                <command id="cmd_add_item"/>
index 7b003ea..2f67d0a 100644 (file)
@@ -58,8 +58,8 @@
         ]]>
     </script>
 
-       <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-       <messagecatalog id="serialStrings" src="/xul/server/locale/<!--#echo var='locale'-->/serial.properties" />
+       <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+       <stringbundle id="serialStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/serial.properties" />
 
     <vbox id="brief_display_box"/>
 
index f8a6ad1..c3ff278 100644 (file)
@@ -5,7 +5,6 @@
 @namespace xhtml url("http://www.w3.org/1999/xhtml"); 
 
 help { -moz-binding: url('/xul/server/main/bindings.xml#help'); }
-messagecatalog { -moz-binding: url('/xul/server/main/bindings.xml#messagecatalog'); }
 .shrinkable_groupbox { font-weight: bold; -moz-binding: url('/xul/server/main/bindings.xml#caption'); }
 
 window:not([active="true"]) menubar > menu { color: menutext !important }