[open-ils-commits] r8652 - in trunk/Open-ILS: web/opac/locale/en-US
xul/staff_client/server/admin xul/staff_client/server/circ
xul/staff_client/server/locale/en-US
svn at svn.open-ils.org
svn at svn.open-ils.org
Tue Feb 5 23:12:32 EST 2008
Author: dbs
Date: 2008-02-05 22:44:09 -0500 (Tue, 05 Feb 2008)
New Revision: 8652
Modified:
trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
trunk/Open-ILS/xul/staff_client/server/admin/transit_list.js
trunk/Open-ILS/xul/staff_client/server/admin/transit_list.xul
trunk/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml
trunk/Open-ILS/xul/staff_client/server/circ/circ_brief.xul
trunk/Open-ILS/xul/staff_client/server/locale/en-US/admin.properties
trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
Log:
i18n improvements as I go through updating status
Modified: trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2008-02-06 03:32:02 UTC (rev 8651)
+++ trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2008-02-06 03:44:09 UTC (rev 8652)
@@ -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">
Modified: trunk/Open-ILS/xul/staff_client/server/admin/transit_list.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/admin/transit_list.js 2008-02-06 03:32:02 UTC (rev 8651)
+++ trunk/Open-ILS/xul/staff_client/server/admin/transit_list.js 2008-02-06 03:44:09 UTC (rev 8652)
@@ -34,7 +34,7 @@
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 @@
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 @@
}
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 @@
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 @@
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 @@
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 @@
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 @@
}
}
} 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 @@
}
} 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); }
}
}
);
Modified: trunk/Open-ILS/xul/staff_client/server/admin/transit_list.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/admin/transit_list.xul 2008-02-06 03:32:02 UTC (rev 8651)
+++ trunk/Open-ILS/xul/staff_client/server/admin/transit_list.xul 2008-02-06 03:44:09 UTC (rev 8652)
@@ -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">
Modified: trunk/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml 2008-02-06 03:32:02 UTC (rev 8651)
+++ trunk/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml 2008-02-06 03:44:09 UTC (rev 8652)
@@ -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>
Modified: trunk/Open-ILS/xul/staff_client/server/circ/circ_brief.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/circ_brief.xul 2008-02-06 03:32:02 UTC (rev 8651)
+++ trunk/Open-ILS/xul/staff_client/server/circ/circ_brief.xul 2008-02-06 03:44:09 UTC (rev 8652)
@@ -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();
Modified: trunk/Open-ILS/xul/staff_client/server/locale/en-US/admin.properties
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/locale/en-US/admin.properties 2008-02-06 03:32:02 UTC (rev 8651)
+++ trunk/Open-ILS/xul/staff_client/server/locale/en-US/admin.properties 2008-02-06 03:44:09 UTC (rev 8652)
@@ -27,3 +27,14 @@
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
Modified: trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties 2008-02-06 03:32:02 UTC (rev 8651)
+++ trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties 2008-02-06 03:44:09 UTC (rev 8652)
@@ -60,6 +60,7 @@
# "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.
More information about the open-ils-commits
mailing list