i18n improvements as I go through updating status

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

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 1d95636..74ed591 100644 (file)
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -1454,6 +1454,7 @@
 <!ENTITY staff.server.admin.stat_cat.update_success "Update succeeded">
 <!ENTITY staff.server.admin.upload_xacts.title "Upload Offline Transactions">
 <!ENTITY staff.server.admin.upload_xacts.header "Uploading transactions...">
+<!ENTITY staff.server.admin.upload_xacts.upload "Upload">
 <!ENTITY staff.circ.checkin_overlay.sel_clip.label "Copy to Clipboard">
 <!ENTITY staff.circ.checkin_overlay.sel_clip.accesskey "C">
 <!ENTITY staff.circ.checkin_overlay.sel_bucket.label "Add to Item Bucket">

diff --git a/Open-ILS/xul/staff_client/server/admin/transit_list.js b/Open-ILS/xul/staff_client/server/admin/transit_list.js
index 2f48ce8..e3a8519 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/transit_list.js
+++ b/Open-ILS/xul/staff_client/server/admin/transit_list.js
@@ -34,7 +34,7 @@ admin.transit_list.prototype = {
                                false
                        );
                } else {
-                       throw('Missing library list.\n');
+                       throw(document.getElementById('adminStrings').getString('staff.admin.transit_list.missing_list') + '\n');
                }
 
                file = new util.file('transit_list_prefs.'+obj.data.server_unadorned);
@@ -76,7 +76,7 @@ admin.transit_list.prototype = {
                                if (util.date.check('YYYY-MM-DD',_string[1]+'-'+_string[2]+'-'+_string[3])) {
                                        _date = util.date.buildDate( _string[1], _string[2], _string[3], 0, 0, 0);
                                } else {
-                                       alert('Invalid Date (' + _string + '), setting to Today'); 
+                                       alert(document.getElementById('adminStrings').getFormattedString('staff.admin.transit_list.invalid_date', [_string])); 
                                        _date = new Date(); _date = util.date.buildDate( _date.getFullYear(), _date.getMonth()+1, _date.getDate(), 0, 0, 0); // morning
                                }
                        }
@@ -89,7 +89,7 @@ admin.transit_list.prototype = {
                        }
 
                        if (! util.date.check('YYYY-MM-DD',util.date.formatted_date(_date,"%F")) ) { 
-                               alert('Invalid Date (' + _date + ',' + util.date.formatted_date(_date,"%F") + '), setting to Today'); 
+                               alert(document.getElementById('adminStrings').getFormattedString('staff.admin.transit_list.invalid_date', [_date, util.date.formatted_date(_date,"%F")])); 
                                _date = new Date(); _date = util.date.buildDate( _date.getFullYear(), _date.getMonth()+1, _date.getDate(), 0, 0, 0); // morning
                        }
                                
@@ -99,7 +99,7 @@ admin.transit_list.prototype = {
 
                        return util.date.formatted_date(_date,'%{iso8601}');
                } catch(E) {
-                       try { obj.error.standard_unexpected_error_alert('processing date',E); } catch(F) { alert(E); }
+                       try { obj.error.standard_unexpected_error_alert(document.getElementById('adminStrings').getString('staff.admin.transit_list.date_processing.error'),E); } catch(F) { alert(E); }
                        _date = new Date(); _date = util.date.buildDate( _date.getFullYear(), _date.getMonth()+1, _date.getDate(), 0, 0, 0); // morning
                        return util.date.formatted_date(_date,'%{iso8601}');
                }
@@ -151,16 +151,16 @@ admin.transit_list.prototype = {
                                                if (rows.length > 0) {
                                                        exec.chain( rows );
                                                } else {
-                                                       alert('No matching transits.');
+                                                       alert(document.getElementById('adminStrings').getString('staff.admin.transit_list.no_match'));
                                                }
 
                                        } catch(E) {
-                                               try { obj.error.standard_unexpected_error_alert('retrieving transits',E); } catch(F) { alert(E); }
+                                               try { obj.error.standard_unexpected_error_alert(document.getElementById('adminStrings').getString('staff.admin.transit_list.retrieving_transit.error'),E); } catch(F) { alert(E); }
                                        }
                                }
                        );
                } catch(E) {
-                       try { obj.error.standard_unexpected_error_alert('pre-retrieving transits',E); } catch(F) { alert(E); }
+                       try { obj.error.standard_unexpected_error_alert(document.getElementById('adminStrings').getString('staff.admin.transit_list.preretrieving_transit.error'),E); } catch(F) { alert(E); }
                }
        },
 
@@ -227,7 +227,7 @@ admin.transit_list.prototype = {
                                                        function(transit,hold) { return obj.get_rest_of_row_given_transit_and_hold(params,transit,hold); }
                                                );
                                        } catch(E) {
-                                               try { obj.error.standard_unexpected_error_alert('retrieving row',E); } catch(F) { alert(E); }
+                                               try { obj.error.standard_unexpected_error_alert(document.getElementById('adminStrings').getString('staff.admin.transit_list.retrieving_row.error'),E); } catch(F) { alert(E); }
                                        }
                                },
                                'on_select' : function(ev) {
@@ -281,7 +281,7 @@ admin.transit_list.prototype = {
                                                                        var r_ahr = req3.getResultObject();
                                                                        if (typeof r_ahr.ilsevent != 'undefined') throw(r_ahr);
                                                                        if (r_ahr.length == 0) {
-                                                                               try { obj.error.standard_unexpected_error_alert('Empty array returned by hold retrieve.  retrieving hold id = ' + r_atc.hold() + ' for transit id = ' + transit_id,E); } catch(F) { alert(E); }
+                                                                               try { obj.error.standard_unexpected_error_alert(document.getElementById('adminStrings').getString('staff.admin.transit_list.empty_array.error') + document.getElementById('adminStrings').getFormattedString('staff.admin.transit_list.empty_array.error', [r_atc.hold(), transit_id]),E); } catch(F) { alert(E); }
                                                                                do_this(r_atc,null);
                                                                        } else {
                                                                                if (instanceOf(r_ahr[0],ahr)) {
@@ -291,7 +291,7 @@ admin.transit_list.prototype = {
                                                                                }
                                                                        }
                                                                } catch(E) {
-                                                                       try { obj.error.standard_unexpected_error_alert('retrieving hold id = ' + r_atc.hold() + ' for transit id = ' + transit_id,E); } catch(F) { alert(E); }
+                                                                       try { obj.error.standard_unexpected_error_alert(document.getElementById('adminStrings').getFormattedString('staff.admin.transit_list.empty_array.error', [r_atc.hold(), transit_id]),E); } catch(F) { alert(E); }
                                                                        do_this(r_atc,null);
                                                                }
                                                        }
@@ -301,7 +301,7 @@ admin.transit_list.prototype = {
                                        }
 
                                } catch(E) {
-                                       try { obj.error.standard_unexpected_error_alert('retrieving transit id = ' + transit_id,E); } catch(F) { alert(E); }
+                                       try { obj.error.standard_unexpected_error_alert(document.getElementById('adminStrings').getFormattedString('staff.admin.transit_list.transit_id.error', [transit_id]),E); } catch(F) { alert(E); }
                                }
                        }
                );

diff --git a/Open-ILS/xul/staff_client/server/admin/transit_list.xul b/Open-ILS/xul/staff_client/server/admin/transit_list.xul
index 12a45ae..4397895 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/transit_list.xul
+++ b/Open-ILS/xul/staff_client/server/admin/transit_list.xul
@@ -53,6 +53,8 @@
        ]]>
        </script>
 
+       <messagecatalog id="adminStrings" src='/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
+
        <vbox flex="1" class="my_overflow">
                <hbox>
                        <groupbox id="lib_hbox" orient="horizontal">

diff --git a/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml b/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml
index 8814788..16c3e34 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml
@@ -36,7 +36,7 @@
                seskey:<input type='text' id="seskey" name='seskey' value=''> </input>
                file:<input type='file' id="file" name='file'> </input> 
                html:<input type='text' id="html" name='html' value='1'> </input> 
-               <input type='submit' id="submit" name='Submit' value='Upload' disabled="true"> </input>
+               <input type='submit' id="submit" name='Submit' value='&staff.server.admin.upload_xacts.upload;' disabled="true"> </input>
        </form>
 </body>
 </html>

diff --git a/Open-ILS/xul/staff_client/server/circ/circ_brief.xul b/Open-ILS/xul/staff_client/server/circ/circ_brief.xul
index c7fbb9e..c7d7218 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/circ_brief.xul
+++ b/Open-ILS/xul/staff_client/server/circ/circ_brief.xul
@@ -69,7 +69,7 @@
                                                if (get_bool( r_circ.desk_renewal() ) ) r += 'DESK ';
                                                if (get_bool(r_circ.opac_renewal() ) ) r += 'OPAC ';
                                                if (get_bool(r_circ.phone_renewal() ) ) r += 'PHONE ';
-                                               $('renewal').value = r || 'No';
+                                               $('renewal').value = r || document.getElementById('circStrings').getString('staff.circ.checkout.no.btn');
                                                g.patron_id = r_circ.usr(); $('add_billing').disabled = false;
                                                g.network.simple_request('FM_AU_FLESHED_RETRIEVE_VIA_ID',[ ses(), r_circ.usr() ], function(preq) {
                                                        var r_au = preq.getResultObject();

diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/admin.properties b/Open-ILS/xul/staff_client/server/locale/en-US/admin.properties
index 671ae1d..5a404c5 100644 (file)
--- a/Open-ILS/xul/staff_client/server/locale/en-US/admin.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/admin.properties
@@ -27,3 +27,14 @@ staff.admin.font_settings.status_msg.ALL_FONTS_16PT=Global Font set to 16pt
 staff.admin.font_settings.status_msg.ALL_FONTS_17PT=Global Font set to 17pt
 staff.admin.font_settings.status_msg.ALL_FONTS_18PT=Global Font set to 18pt
 staff.admin.font_settings.status_msg.ALL_FONTS_DEFAULT=Global Font Adjust set to Default
+staff.admin.transit_list.missing_list=Missing library list.
+staff.admin.transit_list.no_match=No matching transits.
+staff.admin.transit_list.invalid_date=Invalid Date (%1$s), setting to Today
+staff.admin.transit_list.invalid_date_format=Invalid Date (%1$s,%2$s), setting to Today
+staff.admin.transit_list.date_processing.error=error processing date
+staff.admin.transit_list.retrieving_transit.error=error retrieving transits
+staff.admin.transit_list.preretrieving_transit.error=error pre-retrieving transits
+staff.admin.transit_list.retrieving_row.error=error retrieving row
+staff.admin.transit_list.empty_array.error=Empty array returned by hold retrieve.
+staff.admin.transit_list.retrieve_hold.error=retrieving hold id = %1$s for transit id = %2$s
+staff.admin.transit_list.transit_id.error=retrieving transit id = %1$s

diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
index fb4b96c..056df1a 100644 (file)
--- a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
@@ -60,6 +60,7 @@ staff.circ.checkout.permission_denied=Permission Denied = %1$s
 # "Circulation" - check &staff.main.menu.circ.label; in lang.dtd
 # "Offline Interface" - check &staff.main.menu.circ.offline.label; in lang.dtd
 staff.circ.checkout.suggest_offline=Check Out Failed.  If you wish to use the offline interface, in the top menubar select Circulation -> Offline Interface
+staff.circ.checkout.barcode=Barcode:
 staff.circ.circ_brief.staff_out_id=Check Out Staff ID = %1$s
 staff.circ.circ_brief.staff_in_id=Check In Staff ID = %1$s
 staff.circ.circ_brief.failure=Failure rendering circulation.