From 866e0f49afce510d97d2f0c91a931e2141873e4f Mon Sep 17 00:00:00 2001 From: dbs Date: Mon, 21 Jan 2008 17:31:02 +0000 Subject: [PATCH] Eliminate lang.js (old i18n approach). Load common.properties in util_overlay.xul so it is available globally. git-svn-id: svn://svn.open-ils.org/ILS/trunk@8450 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/xul/staff_client/Makefile | 3 - .../xul/staff_client/chrome/content/main/main.js | 2 - .../xul/staff_client/chrome/content/main/main.xul | 3 +- .../xul/staff_client/chrome/content/util/error.js | 6 -- Open-ILS/xul/staff_client/external/dtd2js.pl | 21 ------ Open-ILS/xul/staff_client/external/dtd2js.sh | 2 - .../staff_client/server/OpenILS/util_overlay.xul | 2 + .../staff_client/server/admin/font_settings.xul | 1 - .../staff_client/server/admin/hold_pull_list.xul | 2 - .../server/admin/offline_manage_xacts.xul | 1 - .../xul/staff_client/server/admin/transit_list.xul | 2 - .../xul/staff_client/server/cat/copy_buckets.xul | 1 - Open-ILS/xul/staff_client/server/circ/util.js | 78 ++++++++++------------ .../server/locale/en-US/common.properties | 51 ++++++++++++++ Open-ILS/xul/staff_client/server/main/data.xul | 6 +- Open-ILS/xul/staff_client/server/patron/bills.js | 22 +++--- .../xul/staff_client/server/patron/info_group.xul | 1 - .../staff_client/server/patron/search_result.js | 1 - Open-ILS/xul/staff_client/server/patron/util.js | 25 ++----- 19 files changed, 107 insertions(+), 123 deletions(-) delete mode 100755 Open-ILS/xul/staff_client/external/dtd2js.pl delete mode 100755 Open-ILS/xul/staff_client/external/dtd2js.sh diff --git a/Open-ILS/xul/staff_client/Makefile b/Open-ILS/xul/staff_client/Makefile index 19705f4254..05edd2fb56 100644 --- a/Open-ILS/xul/staff_client/Makefile +++ b/Open-ILS/xul/staff_client/Makefile @@ -48,9 +48,6 @@ stamp: generated: @echo ' * Grabbing lang.dtd from the OPAC code ' cp ../../../Open-ILS/web/opac/locale/en-US/lang.dtd build/chrome/locale/en-US/ - # Generate the lang.js file for the stamped build - external/dtd2js.pl build/chrome/locale/en-US/lang.dtd > build/chrome/content/main/lang.js - cp build/chrome/content/main/lang.js build/server/main/lang.js open-ils: @echo ' * Grabbing more OPAC code and legacy code and custom code' diff --git a/Open-ILS/xul/staff_client/chrome/content/main/main.js b/Open-ILS/xul/staff_client/chrome/content/main/main.js index eec3f72ef9..029bea9334 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/main.js +++ b/Open-ILS/xul/staff_client/chrome/content/main/main.js @@ -58,8 +58,6 @@ function main_init() { JSAN.use('OpenILS.data'); G.data = new OpenILS.data() G.data.on_error = G.auth.logoff; - G.data.entities = entities; - G.data.stash('entities'); JSAN.use('util.file'); G.file = new util.file(); diff --git a/Open-ILS/xul/staff_client/chrome/content/main/main.xul b/Open-ILS/xul/staff_client/chrome/content/main/main.xul index e669399257..8854a53ecf 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/main.xul +++ b/Open-ILS/xul/staff_client/chrome/content/main/main.xul @@ -49,11 +49,10 @@ - diff --git a/Open-ILS/xul/staff_client/chrome/content/util/error.js b/Open-ILS/xul/staff_client/chrome/content/util/error.js index 56fbd60e1d..8d5a03c06b 100644 --- a/Open-ILS/xul/staff_client/chrome/content/util/error.js +++ b/Open-ILS/xul/staff_client/chrome/content/util/error.js @@ -254,12 +254,6 @@ util.error.prototype = { 's_alert' : function (s) { alert(s); }, - 'get_ilsevent' : function(status) { - JSAN.use('OpenILS.data'); - this.OpenILS.data = new OpenILS.data(); this.OpenILS.data.init({'via':'stash'}); - return this.OpenILS.data.entities['ilsevent.'+status]; - }, - 'standard_network_error_alert' : function(msg) { var obj = this; if (!msg) msg = ''; diff --git a/Open-ILS/xul/staff_client/external/dtd2js.pl b/Open-ILS/xul/staff_client/external/dtd2js.pl deleted file mode 100755 index 6894bf01bd..0000000000 --- a/Open-ILS/xul/staff_client/external/dtd2js.pl +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/perl -# -# -# -# -# -# -# - -print "var entities = {};"; -while( $line = <> ) { - - if ($line =~ /\s*$/) { - print "entities['$1'] = $2;\n"; - } elsif ($line =~ /^\s*\s*$/) { - # Ignore comments - } else { - chomp $line; - if ($line) { print STDERR "Problem with: $line\n"; } - } -} diff --git a/Open-ILS/xul/staff_client/external/dtd2js.sh b/Open-ILS/xul/staff_client/external/dtd2js.sh deleted file mode 100755 index 12d8a5c4f0..0000000000 --- a/Open-ILS/xul/staff_client/external/dtd2js.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -./dtd2js.pl ../../../web/opac/locale/en-US/lang.dtd > ../chrome/content/main/lang.js diff --git a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul index bc92d5ae4c..695e53281c 100644 --- a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul +++ b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul @@ -19,6 +19,8 @@ + + diff --git a/Open-ILS/xul/staff_client/server/admin/font_settings.xul b/Open-ILS/xul/staff_client/server/admin/font_settings.xul index 19e23ede62..6466cc0209 100644 --- a/Open-ILS/xul/staff_client/server/admin/font_settings.xul +++ b/Open-ILS/xul/staff_client/server/admin/font_settings.xul @@ -128,7 +128,6 @@ ]]> - diff --git a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xul b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xul index 5c7a470e97..1df350c352 100644 --- a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xul +++ b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xul @@ -67,8 +67,6 @@ ]]> - - diff --git a/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul b/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul index 759cdb72cf..ec25900300 100644 --- a/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul +++ b/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul @@ -52,7 +52,6 @@ ]]> - 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 116fd967c0..12a45ae9bb 100644 --- a/Open-ILS/xul/staff_client/server/admin/transit_list.xul +++ b/Open-ILS/xul/staff_client/server/admin/transit_list.xul @@ -53,8 +53,6 @@ ]]> - - diff --git a/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul b/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul index 202e2d8a12..562d7bfd58 100644 --- a/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul +++ b/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul @@ -73,7 +73,6 @@ ]]> - diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js index 2fad04387f..27a2fba30c 100644 --- a/Open-ILS/xul/staff_client/server/circ/util.js +++ b/Open-ILS/xul/staff_client/server/circ/util.js @@ -403,20 +403,18 @@ circ.util.columns = function(modify,params) { JSAN.use('util.network'); var network = new util.network(); JSAN.use('util.money'); - function getString(s) { return data.entities[s]; } - var c = [ { - 'id' : 'acp_id', 'label' : getString('staff.acp_label_id'), 'flex' : 1, + 'id' : 'acp_id', 'label' : document.getElementById('commonStrings').getString('staff.acp_label_id'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.acp.id(); }, 'persist' : 'hidden width ordinal', }, { - 'id' : 'circ_id', 'label' : getString('staff.circ_label_id'), 'flex' : 1, + 'id' : 'circ_id', 'label' : document.getElementById('commonStrings').getString('staff.circ_label_id'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.circ ? my.circ.id() : ( my.acp.circulations() ? my.acp.circulations()[0].id() : ""); }, 'persist' : 'hidden width ordinal', }, { - 'id' : 'mvr_doc_id', 'label' : getString('staff.mvr_label_doc_id'), 'flex' : 1, + 'id' : 'mvr_doc_id', 'label' : document.getElementById('commonStrings').getString('staff.mvr_label_doc_id'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mvr.doc_id(); }, 'persist' : 'hidden width ordinal', }, @@ -425,12 +423,12 @@ circ.util.columns = function(modify,params) { 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.service; }, }, { - 'id' : 'barcode', 'label' : getString('staff.acp_label_barcode'), 'flex' : 1, + 'id' : 'barcode', 'label' : document.getElementById('commonStrings').getString('staff.acp_label_barcode'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.acp.barcode(); }, 'persist' : 'hidden width ordinal', }, { - 'id' : 'call_number', 'label' : getString('staff.acp_label_call_number'), 'flex' : 1, + 'id' : 'call_number', 'label' : document.getElementById('commonStrings').getString('staff.acp_label_call_number'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { if (my.acp && my.acp.call_number() == -1) { return "Not Cataloged"; } else { if (!my.acn) { var x = network.simple_request("FM_ACN_RETRIEVE",[ my.acp.call_number() ]); if (x.ilsevent) { return "Not Cataloged"; } else { my.acn = x; return x.label(); } } else { return my.acn.label(); } } }, 'persist' : 'hidden width ordinal', }, @@ -441,28 +439,28 @@ circ.util.columns = function(modify,params) { 'persist' : 'hidden width ordinal', }, { - 'id' : 'copy_number', 'label' : getString('staff.acp_label_copy_number'), 'flex' : 1, 'sort_type' : 'number', + 'id' : 'copy_number', 'label' : document.getElementById('commonStrings').getString('staff.acp_label_copy_number'), 'flex' : 1, 'sort_type' : 'number', 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.acp.copy_number(); }, 'persist' : 'hidden width ordinal', }, { - 'id' : 'location', 'label' : getString('staff.acp_label_location'), 'flex' : 1, + 'id' : 'location', 'label' : document.getElementById('commonStrings').getString('staff.acp_label_location'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { if (Number(my.acp.location())>=0) return data.lookup("acpl", my.acp.location() ).name(); else return my.acp.location().name(); }, 'persist' : 'hidden width ordinal', }, { - 'id' : 'loan_duration', 'label' : getString('staff.acp_label_loan_duration'), 'flex' : 1, + 'id' : 'loan_duration', 'label' : document.getElementById('commonStrings').getString('staff.acp_label_loan_duration'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { switch(my.acp.loan_duration()){ case 1: return "Short"; break; case 2: return "Normal"; break; case 3: return "Long"; break; }; }, 'persist' : 'hidden width ordinal', }, { - 'id' : 'circ_lib', 'label' : getString('staff.acp_label_circ_lib'), 'flex' : 1, + 'id' : 'circ_lib', 'label' : document.getElementById('commonStrings').getString('staff.acp_label_circ_lib'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { if (Number(my.acp.circ_lib())>=0) return data.hash.aou[ my.acp.circ_lib() ].shortname(); else return my.acp.circ_lib().shortname(); }, 'persist' : 'hidden width ordinal', }, { - 'id' : 'fine_level', 'label' : getString('staff.acp_label_fine_level'), 'flex' : 1, + 'id' : 'fine_level', 'label' : document.getElementById('commonStrings').getString('staff.acp_label_fine_level'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { switch(my.acp.fine_level()){ case 1: return "Low"; break; case 2: return "Normal"; break; case 3: return "High"; break; }; }, 'persist' : 'hidden width ordinal', @@ -496,19 +494,19 @@ circ.util.columns = function(modify,params) { 'primary' : false, 'hidden' : true, 'render' : function(my) { return get_bool( my.acp.deposit() ) ? "Yes" : "No"; }, }, { - 'persist' : 'hidden width ordinal', 'id' : 'deposit_amount', 'label' : getString('staff.acp_label_deposit_amount'), 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'deposit_amount', 'label' : document.getElementById('commonStrings').getString('staff.acp_label_deposit_amount'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.acp.price() == null ? "" : util.money.sanitize(my.acp.deposit_amount()); }, 'sort_type' : 'money', }, { - 'persist' : 'hidden width ordinal', 'id' : 'price', 'label' : getString('staff.acp_label_price'), 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'price', 'label' : document.getElementById('commonStrings').getString('staff.acp_label_price'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.acp.price() == null ? "" : util.money.sanitize(my.acp.price()); }, 'sort_type' : 'money', }, { - 'persist' : 'hidden width ordinal', 'id' : 'circ_as_type', 'label' : getString('staff.acp_label_circ_as_type'), 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'circ_as_type', 'label' : document.getElementById('commonStrings').getString('staff.acp_label_circ_as_type'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.acp.circ_as_type(); }, }, { - 'persist' : 'hidden width ordinal', 'id' : 'circ_modifier', 'label' : getString('staff.acp_label_circ_modifier'), 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'circ_modifier', 'label' : document.getElementById('commonStrings').getString('staff.acp_label_circ_modifier'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.acp.circ_modifier(); }, }, { @@ -537,7 +535,7 @@ circ.util.columns = function(modify,params) { 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.circ.xact_finish(); }, }, { - 'persist' : 'hidden width ordinal', 'id' : 'due_date', 'label' : getString('staff.circ_label_due_date'), 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'due_date', 'label' : document.getElementById('commonStrings').getString('staff.circ_label_due_date'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.circ ? my.circ.due_date().substr(0,10) : (my.acp.circulations() ? my.acp.circulations()[0].due_date().substr(0,10) : ""); }, }, { @@ -549,11 +547,11 @@ circ.util.columns = function(modify,params) { 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.acp.edit_date().substr(0,10); }, }, { - 'persist' : 'hidden width ordinal', 'id' : 'title', 'label' : getString('staff.mvr_label_title'), 'flex' : 2, 'sort_type' : 'title', + 'persist' : 'hidden width ordinal', 'id' : 'title', 'label' : document.getElementById('commonStrings').getString('staff.mvr_label_title'), 'flex' : 2, 'sort_type' : 'title', 'primary' : false, 'hidden' : true, 'render' : function(my) { try { return my.mvr.title(); } catch(E) { return my.acp.dummy_title(); } } }, { - 'persist' : 'hidden width ordinal', 'id' : 'author', 'label' : getString('staff.mvr_label_author'), 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'author', 'label' : document.getElementById('commonStrings').getString('staff.mvr_label_author'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { try { return my.mvr.author(); } catch(E) { return my.acp.dummy_author(); } } }, { @@ -577,7 +575,7 @@ circ.util.columns = function(modify,params) { 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mvr.tcn(); }, }, { - 'persist' : 'hidden width ordinal', 'id' : 'renewal_remaining', 'label' : getString('staff.circ_label_renewal_remaining'), 'flex' : 0, + 'persist' : 'hidden width ordinal', 'id' : 'renewal_remaining', 'label' : document.getElementById('commonStrings').getString('staff.circ_label_renewal_remaining'), 'flex' : 0, 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.circ ? my.circ.renewal_remaining() : (my.acp.circulations() ? my.acp.circulations()[0].renewal_remaining() : ""); }, 'sort_type' : 'number', }, { @@ -589,7 +587,7 @@ circ.util.columns = function(modify,params) { 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.circ ? my.circ.stop_fines_time() : (my.acp.circulations() ? my.acp.circulations()[0].stop_fines_time() : ""); }, }, { - 'persist' : 'hidden width ordinal', 'id' : 'status', 'label' : getString('staff.acp_label_status'), 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'status', 'label' : document.getElementById('commonStrings').getString('staff.acp_label_status'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { if (Number(my.acp.status())>=0) return data.hash.ccs[ my.acp.status() ].name(); else return my.acp.status().name(); }, }, { @@ -643,8 +641,6 @@ circ.util.transit_columns = function(modify,params) { JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'}); - function getString(s) { return data.entities[s]; } - var c = [ { 'persist' : 'hidden width ordinal', 'id' : 'transit_item_barcode', 'label' : 'Barcode', 'flex' : 1, @@ -723,8 +719,6 @@ circ.util.hold_columns = function(modify,params) { JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'}); - function getString(s) { return data.entities[s]; } - var c = [ { 'persist' : 'hidden width ordinal', 'id' : 'request_lib', 'label' : 'Request Lib (Full Name)', 'flex' : 1, @@ -764,11 +758,11 @@ circ.util.hold_columns = function(modify,params) { 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.ahr.capture_time() ? my.ahr.capture_time().toString().substr(0,10) : ""; }, }, { - 'persist' : 'hidden width ordinal', 'id' : 'status', 'label' : getString('staff.ahr_status_label'), 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'status', 'label' : document.getElementById('commonStrings').getString('staff.ahr_status_label'), 'flex' : 1, 'primary' : false, 'hidden' : false, 'render' : function(my) { switch(my.status) { case 1: case "1": return "Waiting for copy"; break; case 2: case "2": return "Waiting for capture"; break; case 3: case "3": return "In-Transit"; break; case 4: case "4" : return "Ready for pickup"; break; default: return my.status; break;}; }, }, { - 'persist' : 'hidden width ordinal', 'id' : 'hold_type', 'label' : getString('staff.ahr_hold_type_label'), 'flex' : 0, + 'persist' : 'hidden width ordinal', 'id' : 'hold_type', 'label' : document.getElementById('commonStrings').getString('staff.ahr_hold_type_label'), 'flex' : 0, 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.ahr.hold_type(); }, }, { @@ -785,64 +779,64 @@ circ.util.hold_columns = function(modify,params) { 'render' : function(my) { if (Number(my.ahr.pickup_lib())>=0) return data.hash.aou[ my.ahr.pickup_lib() ].name(); else return my.ahr.pickup_lib().name(); }, }, { - 'persist' : 'hidden width ordinal', 'id' : 'pickup_lib_shortname', 'label' : getString('staff.ahr_pickup_lib_label'), 'flex' : 0, + 'persist' : 'hidden width ordinal', 'id' : 'pickup_lib_shortname', 'label' : document.getElementById('commonStrings').getString('staff.ahr_pickup_lib_label'), 'flex' : 0, 'primary' : false, 'hidden' : true, 'render' : function(my) { if (Number(my.ahr.pickup_lib())>=0) return data.hash.aou[ my.ahr.pickup_lib() ].shortname(); else return my.ahr.pickup_lib().shortname(); }, }, { - 'persist' : 'hidden width ordinal', 'id' : 'current_copy', 'label' : getString('staff.ahr_current_copy_label'), 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'current_copy', 'label' : document.getElementById('commonStrings').getString('staff.ahr_current_copy_label'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.acp ? my.acp.barcode() : "No Copy"; }, }, { - 'persist' : 'hidden width ordinal', 'id' : 'email_notify', 'label' : getString('staff.ahr_email_notify_label'), 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'email_notify', 'label' : document.getElementById('commonStrings').getString('staff.ahr_email_notify_label'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { return get_bool(my.ahr.email_notify()) ? "Yes" : "No"; }, }, { - 'persist' : 'hidden width ordinal', 'id' : 'expire_time', 'label' : getString('staff.ahr_expire_time_label'), 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'expire_time', 'label' : document.getElementById('commonStrings').getString('staff.ahr_expire_time_label'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.ahr.expire_time(); }, }, { - 'persist' : 'hidden width ordinal', 'id' : 'fulfillment_time', 'label' : getString('staff.ahr_fulfillment_time_label'), 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'fulfillment_time', 'label' : document.getElementById('commonStrings').getString('staff.ahr_fulfillment_time_label'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.ahr.fulfillment_time(); }, }, { - 'persist' : 'hidden width ordinal', 'id' : 'holdable_formats', 'label' : getString('staff.ahr_holdable_formats_label'), 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'holdable_formats', 'label' : document.getElementById('commonStrings').getString('staff.ahr_holdable_formats_label'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.ahr.holdable_formats(); }, }, { - 'persist' : 'hidden width ordinal', 'id' : 'id', 'label' : getString('staff.ahr_id_label'), 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'id', 'label' : document.getElementById('commonStrings').getString('staff.ahr_id_label'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.ahr.id(); }, }, { - 'persist' : 'hidden width ordinal', 'id' : 'phone_notify', 'label' : getString('staff.ahr_phone_notify_label'), 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'phone_notify', 'label' : document.getElementById('commonStrings').getString('staff.ahr_phone_notify_label'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.ahr.phone_notify(); }, }, { - 'persist' : 'hidden width ordinal', 'id' : 'prev_check_time', 'label' : getString('staff.ahr_prev_check_time_label'), 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'prev_check_time', 'label' : document.getElementById('commonStrings').getString('staff.ahr_prev_check_time_label'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.ahr.prev_check_time(); }, }, { - 'persist' : 'hidden width ordinal', 'id' : 'requestor', 'label' : getString('staff.ahr_requestor_label'), 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'requestor', 'label' : document.getElementById('commonStrings').getString('staff.ahr_requestor_label'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.ahr.requestor(); }, }, { - 'persist' : 'hidden width ordinal', 'id' : 'selection_depth', 'label' : getString('staff.ahr_selection_depth_label'), 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'selection_depth', 'label' : document.getElementById('commonStrings').getString('staff.ahr_selection_depth_label'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.ahr.selection_depth(); }, }, { - 'persist' : 'hidden width ordinal', 'id' : 'target', 'label' : getString('staff.ahr_target_label'), 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'target', 'label' : document.getElementById('commonStrings').getString('staff.ahr_target_label'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.ahr.target(); }, }, { - 'persist' : 'hidden width ordinal', 'id' : 'usr', 'label' : getString('staff.ahr_usr_label'), 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'usr', 'label' : document.getElementById('commonStrings').getString('staff.ahr_usr_label'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.ahr.usr(); }, }, { - 'persist' : 'hidden width ordinal', 'id' : 'title', 'label' : getString('staff.mvr_label_title'), 'flex' : 1, 'sort_type' : 'title', + 'persist' : 'hidden width ordinal', 'id' : 'title', 'label' : document.getElementById('commonStrings').getString('staff.mvr_label_title'), 'flex' : 1, 'sort_type' : 'title', 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mvr ? my.mvr.title() : "No Title?"; }, }, { - 'persist' : 'hidden width ordinal', 'id' : 'author', 'label' : getString('staff.mvr_label_author'), 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'author', 'label' : document.getElementById('commonStrings').getString('staff.mvr_label_author'), 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mvr ? my.mvr.author() : "No Author?"; }, }, { diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/common.properties b/Open-ILS/xul/staff_client/server/locale/en-US/common.properties index bc454ca7fb..dbfcd0d350 100644 --- a/Open-ILS/xul/staff_client/server/locale/en-US/common.properties +++ b/Open-ILS/xul/staff_client/server/locale/en-US/common.properties @@ -11,3 +11,54 @@ common.barcode.status.warning.barred=Barred common.barcode.status.warning.blocked=Blocked common.barcode.status.warning.unknown=with an unknown code: %1$s common.date.invalid=Invalid Date +lang.version=remote v1 +staff.acp_label_barcode=Barcode +staff.acp_label_call_number=Call Number +staff.acp_label_circ_as_type=Circ As Type +staff.acp_label_circ_lib=Circ Lib +staff.acp_label_circ_modifier=Circ Modifier +staff.acp_label_copy_number=Copy Number +staff.acp_label_deposit_amount=Deposit Amount +staff.acp_label_fine_level=Fine Level +staff.acp_label_id=Copy ID +staff.acp_label_loan_duration=Loan Duration +staff.acp_label_location=Location +staff.acp_label_price=Price +staff.acp_label_status=Status +staff.ahr_current_copy_label=Current Copy +staff.ahr_email_notify_label=Email Notify +staff.ahr_expire_time_label=Expire Time +staff.ahr_fulfillment_time_label=Fulfillment Time +staff.ahr_hold_type_label=Type +staff.ahr_holdable_formats_label=Holdable Formats +staff.ahr_id_label=Hold Id +staff.ahr_phone_notify_label=Phone Notify +staff.ahr_pickup_lib_label=Pickup Lib +staff.ahr_prev_check_time_label=Prev Check Time +staff.ahr_requestor_label=Requestor +staff.ahr_selection_depth_label=Selection Depth +staff.ahr_status_label=Status +staff.ahr_target_label=Target +staff.ahr_usr_label=Usr +staff.circ_label_due_date=Due Date +staff.circ_label_id=Circ Id +staff.circ_label_renewal_remaining=Remaining Renewals +staff.mvr_label_author=Author +staff.mvr_label_doc_id=Doc Id +staff.mvr_label_title=Title +staff.bills_xact_dates_label=Record / Dates +staff.bills_information=Information +staff.bills_current_payment_label=Current Payment +staff.mbts_id_label=Bill # +staff.mbts_xact_start_label=Start +staff.mbts_xact_finish_label=Finish +staff.mbts_total_owed_label=Total Billed +staff.mbts_total_paid_label=Total Paid +staff.mbts_balance_owed_label=Balance Owed +staff.au_label_active=Active +staff.au_label_id=Record ID +staff.au_label_prefix=Prefix +staff.au_label_family_name=Family Name +staff.au_label_first_given_name=First Name +staff.au_label_second_given_name=Middle Name +staff.au_label_suffix=Suffix diff --git a/Open-ILS/xul/staff_client/server/main/data.xul b/Open-ILS/xul/staff_client/server/main/data.xul index be78897eab..a35e20a61c 100644 --- a/Open-ILS/xul/staff_client/server/main/data.xul +++ b/Open-ILS/xul/staff_client/server/main/data.xul @@ -37,12 +37,10 @@ -