From ef54145940be95cd11016220b3826e8d85f102e0 Mon Sep 17 00:00:00 2001 From: dbs Date: Thu, 19 Jun 2008 20:35:21 +0000 Subject: [PATCH] Merge another i18n patch from Craig Ricciuto git-svn-id: svn://svn.open-ils.org/ILS/trunk@9890 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/opac/locale/en-US/lang.dtd | 25 +++ .../server/locale/en-US/common.properties | 3 + .../server/locale/en-US/patron.properties | 94 +++++++- .../server/patron/bill_history.xul | 4 +- .../xul/staff_client/server/patron/display.js | 2 +- .../xul/staff_client/server/patron/holds.js | 205 +++++++++++++----- .../xul/staff_client/server/patron/holds.xul | 12 +- .../server/patron/holds_overlay.xul | 22 +- .../staff_client/server/patron/info_group.xul | 82 ++++--- 9 files changed, 338 insertions(+), 111 deletions(-) diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd index 08e1554dc5..0ce32ac475 100644 --- a/Open-ILS/web/opac/locale/en-US/lang.dtd +++ b/Open-ILS/web/opac/locale/en-US/lang.dtd @@ -2173,3 +2173,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 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 e283b17b04..21803b3092 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 @@ -16,6 +16,9 @@ common.action_complete=Action completed. # common.grouping_string = the string that should be inserted between elements of a grouped list common.grouping_string=, common.unimplemented=Not yet implemented +common.yes=Yes +common.no=No +common.check_to_confirm=Check here to confirm this message lang.version=remote v1 openils.global_util.clear_cache.error=Problem clearing the cache: %1$s openils.global_util.clipboard.error=Clipboard action failed: %1$s diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties b/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties index 6bce7f58ee..3f8e733107 100644 --- a/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties +++ b/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties @@ -30,7 +30,7 @@ staff.patron.bill_history.handle_add.btn_no=No staff.patron.bill_history.handle_add.confirm_message=Check here to confirm this message staff.patron.bill_history.print_bills.print_error=printing bills staff.patron.bills.bill_payment_amount.credit_amount=Patron only has %1$s in credit. -staff.patron.bills.bill_change_amount.greedy=Someone wanted more money than they deserved\n +staff.patron.bills.bill_change_amount.greedy=Someone wanted more money than they deserved staff.patron.bills.apply_payment.nothing_applied=No payments or patron credit applied. staff.patron.bills.pay.annotate_payment=Please annotate this payment: staff.patron.bills.pay.annotate_payment.title=Annotate Payment @@ -54,11 +54,11 @@ staff.patron.bill_wizard.patron_bill_finish.billing_added=Billing added. staff.patron.display.cmd_patron_edit.edit_search=Editor would like to search for: %1$s staff.patron.display.spawn_editor.editing_related_patron=Editing Related Patron staff.patron.display.init.retrieving=Retrieving... -staff.patron.display.init.network_request.alert_message=Alert message: "%1$s"

\n -staff.patron.display.init.network_request.inactive_card=Patron account retrieved with an INACTIVE card.

\n -staff.patron.display.init.network_request.account_barred=Patron account is BARRED.

\n -staff.patron.display.init.network_request.account_inactive=Patron account is INACTIVE.

\n -staff.patron.display.init.network_request.accoutn_expired=Patron account is EXPIRED.

\n +staff.patron.display.init.network_request.alert_message=Alert message: "%1$s"

+staff.patron.display.init.network_request.inactive_card=Patron account retrieved with an INACTIVE card.

+staff.patron.display.init.network_request.account_barred=Patron account is BARRED.

+staff.patron.display.init.network_request.account_inactive=Patron account is INACTIVE.

+staff.patron.display.init.network_request.account_expired=Patron account is EXPIRED.

staff.patron.display.init.network_request.window_title=Alert staff.patron.display.init.network_request.window_message=Press a navigation button above (for example, Check Out) to clear this alert. staff.patron.display.init.network_request.dump_error_message=Not re-displaying this alert message: %1$s @@ -72,3 +72,85 @@ staff.patron.hold_notices.cancel_accesskey=C staff.patron.hold_notices.add_notif_record=Add Notification Record staff.patron.hold_notices.add_notif_record_accesskey=A staff.patron.hold_notices.new_notification.not_created=The notification was not likely created. +staff.patron.holds.init.hold_num_error=Error retrieving details for hold #%1$s +staff.patron.holds.show_notifications.error_rendering_notifs=Error rendering/retrieving hold notifications. +staff.patron.holds.holds_edit_selection_depth.choose_hold_range=Please choose a Hold Range: +staff.patron.holds.holds_edit_selection_depth.done.label=Done +staff.patron.holds.holds_edit_selection_depth.done.accesskey=D +staff.patron.holds.holds_edit_selection_depth.cancel.label=Cancel +staff.patron.holds.holds_edit_selection_depth.cancel.accesskey=C +staff.patron.holds.holds_edit_selection_depth.choose_library=Choose a Pick Up Library +staff.patron.holds.holds_edit_selection_depth.modify_holds_message.singular=Are you sure you would like to change the Hold Range for hold %1$s to "%2$s"?; +staff.patron.holds.holds_edit_selection_depth.modify_holds_message.plural=Are you sure you would like to change the Hold Range for holds %1$s to "%2$s"?; +staff.patron.holds.holds_edit_selection_depth.modify_holds_title=Modifying Holds +staff.patron.holds.holds_not_modified=Holds not likely modified. +staff.patron.holds.holds_edit_pickup_lib.new_pickup_lib.description=Please choose a new Pickup Library: +staff.patron.holds.holds_edit_pickup_lib.done.label=Done +staff.patron.holds.holds_edit_pickup_lib.done.accesskey=D +staff.patron.holds.holds_edit_pickup_lib.cancel.label=Cancel +staff.patron.holds.holds_edit_pickup_lib.cancel.accesskey=C +staff.patron.holds.holds_edit_pickup_lib.choose_lib=Choose a Pick Up Library +staff.patron.holds.holds_edit_pickup_lib.change_pickup_lib_message.singular=Are you sure you would like to change the Pick Up Library for hold %1$s to %2$s?; +staff.patron.holds.holds_edit_pickup_lib.change_pickup_lib_message.plural=Are you sure you would like to change the Pick Up Library for holds %1$s to %2$s?; +staff.patron.holds.holds_edit_pickup_lib.change_pickup_lib_title=Modifying Holds +staff.patron.holds.holds_edit_phone_notify.new_phone_number=Please enter a new phone number for hold notification (leave the field empty to disable phone notification): +staff.patron.holds.holds_edit_phone_notify.btn_done.label=Done +staff.patron.holds.holds_edit_phone_notify.btn_done.accesskey=D +staff.patron.holds.holds_edit_phone_notify.btn_cancel.label=Cancel +staff.patron.holds.holds_edit_phone_notify.btn_cancel.accesskey=C +staff.patron.holds.holds_edit_phone_notify.choose_phone_number=Choose a Hold Notification Phone Number +staff.patron.holds.holds_edit_phone_notify.confirm_phone_number_change.singular=Are you sure you would like to change the Notification Phone Number for hold %1$s to "%2$s"? +staff.patron.holds.holds_edit_phone_notify.confirm_phone_number_change.plural=Are you sure you would like to change the Notification Phone Number for holds %1$s to "%2$s"? +staff.patron.holds.holds_edit_phone_notify.modifying_holds_title=Modifying Holds +staff.patron.holds.holds_edit_email_notify.description=Send email notifications (when appropriate)? The email address used is found in the hold recipient account. +staff.patron.holds.holds_edit_email_notify.btn_email.label=Email +staff.patron.holds.holds_edit_email_notify.btn_email.accesskey=E +staff.patron.holds.holds_edit_email_notify.btn_no_email.label=No Email +staff.patron.holds.holds_edit_email_notify.btn_no_email.accesskey=N +staff.patron.holds.holds_edit_email_notify.btn_cancel.label=Cancel +staff.patron.holds.holds_edit_email_notify.btn_cancel.accesskey=C +staff.patron.holds.holds_edit_email_notify.set_notifs=Set Email Notification for Holds +staff.patron.holds.holds_edit_email_notify.enable_email.singular=Are you sure you would like to enable email notification for hold %1$s? +staff.patron.holds.holds_edit_email_notify.enable_email.plural=Are you sure you would like to enable email notification for holds %1$s? +staff.patron.holds.holds_edit_email_notify.disable_email.singular=Are you sure you would like to disable email notification for hold %1$s? +staff.patron.holds.holds_edit_email_notify.disable_email.plural=Are you sure you would like to disable email notification for hold %1$s? +staff.patron.holds.holds_edit_email_notify.mod_holds_title=Modifying Holds +staff.patron.holds.holds_retarget.reset_hold_message.singular=Are you sure you would like to reset hold %1$s? +staff.patron.holds.holds_retarget.reset_hold_message.plural=Are you sure you would like to reset holds %1$s? +staff.patron.holds.holds_retarget.reset_hold_title=Resetting Holds +staff.patron.holds.holds_retarget.holds_not_reset=Holds not likely reset. +staff.patron.holds.holds_cancel.cancel_hold_message.singular=Are you sure you would like to cancel hold %1$s? +staff.patron.holds.holds_cancel.cancel_hold_message.plural=Are you sure you would like to cancel holds %1$s? +staff.patron.holds.holds_cancel.cancel_hold_title=Cancelling Holds +staff.patron.holds.holds_cancel.cancel_for_barcodes=For barcodes %1$s, should the associated transits also be cancelled? +staff.patron.holds.holds_cancel.cancel_for_barcodes.title=Cancelling Transits +staff.patron.holds.holds_cancel.hold_transits_not_cancelled=Hold transits not likely cancelled. +staff.patron.holds.holds_cancel.hold_not_cancelled=Holds not likely cancelled. +staff.patron.holds.show_catalog.unknown_htype=I do not understand the hold type of %1$s so I can not display the appropriate record in the catalog. +staff.patron.holds.show_catalog.retrieving_title=Retrieving title... +staff.patron.holds.lib_menus.missing_library_list=Missing library list. +staff.patron.info_group.retrieve_group_members.failure=Failed to retrieve all the group members. +staff.patron.info_group.retrieve_patron.tab_name=Retrieving Patron.. +staff.patron.info_group.retrieve_patron.failed_retrieving_patron=Failed to retrieve patron. +staff.patron.info_group.retrieve_patron.failed_retrieving_patrons=Failed to retrieve patrons. +staff.patron.info_group.clone_patron.register_clone.tab_name=Register Patron Clone for Group +staff.patron.info_group.clone_patron.error_spawning_editors=error spawning user editors +staff.patron.info_group.spwan_editor.editing_patron=Editing Related Patron +staff.patron.info_group.spwan_search=spawn search +staff.patron.info_group.remove_patron.warning_message=WARNING: If you remove the currently displayed patron, a NEW group will be displayed in this interface. +staff.patron.info_group.remove_patron.warning_message_confirm=Remove selected patrons from this group? %1$s +staff.patron.info_group.remove_patron.error_removing_patron=error removing patron (id=%1$s) from usergroup +staff.patron.info_group.remove_patron.patrons_removed_from_group=Patrons removed from group. +staff.patron.info_group.remove_patron.patrons_not_removed_from_group=Patron not removed from group. +staff.patron.info_group.link_patron.null_not_allowed=null parameter not allowed +staff.patron.info_group.link_patron.invalid_parameter=Invalid parameter. Expected boolean. +staff.patron.info_group.link_patron.scan_patron_barcode=Please scan a patron barcode: +staff.patron.info_group.link_patron.move_patron_to_new_usergroup=Move patron %1$s into patron %2$s's usergroup... +staff.patron.info_group.link_patron.move.label=Move +staff.patron.info_group.link_patron.move.accesskey=M +staff.patron.info_group.link_patron.done.label=Done +staff.patron.info_group.link_patron.done.accesskey=D +staff.patron.info_group.link_patron.move_patron_to_usergroup=Move Patron into a Usergroup +staff.patron.info_group.link_patron.error_linking_patron=error linking patron (id=%1$s) +staff.patron.info_group.link_patron.usergroups_updated=User groups updated. +staff.patron.info_group.link_patron.error_linking_patrons=error linking patrons diff --git a/Open-ILS/xul/staff_client/server/patron/bill_history.xul b/Open-ILS/xul/staff_client/server/patron/bill_history.xul index 5824f9fa11..3038677262 100644 --- a/Open-ILS/xul/staff_client/server/patron/bill_history.xul +++ b/Open-ILS/xul/staff_client/server/patron/bill_history.xul @@ -267,10 +267,10 @@ if (xul_param('current')) { $('caption').setAttribute('label',$("patronStrings").getString('staff.patron.bill_history.my_init.current_bills')); - document.title = 'Current Bills'; + document.title = $("patronStrings").getString('staff.patron.bill_history.my_init.current_bills'); } else { $('caption').setAttribute('label',$("patronStrings").getString('staff.patron.bill_history.my_init.bill_history')); - document.title = 'Bill History'; + document.title = $("patronStrings").getString('staff.patron.bill_history.my_init.bill_history'); } } catch(E) { diff --git a/Open-ILS/xul/staff_client/server/patron/display.js b/Open-ILS/xul/staff_client/server/patron/display.js index 8edb1f0352..5b67fe6ac7 100644 --- a/Open-ILS/xul/staff_client/server/patron/display.js +++ b/Open-ILS/xul/staff_client/server/patron/display.js @@ -431,7 +431,7 @@ patron.display.prototype = { expire = expire.getTime()/1000 if (expire < now) { - msg += $("patronStrings").getString('staff.patron.display.init.network_request.accoutn_expired'); + msg += $("patronStrings").getString('staff.patron.display.init.network_request.account_expired'); obj.stop_checkouts = true; } } diff --git a/Open-ILS/xul/staff_client/server/patron/holds.js b/Open-ILS/xul/staff_client/server/patron/holds.js index ceb3ef89aa..1374eff940 100644 --- a/Open-ILS/xul/staff_client/server/patron/holds.js +++ b/Open-ILS/xul/staff_client/server/patron/holds.js @@ -1,5 +1,7 @@ dump('entering patron.holds.js\n'); +function $(id) { return document.getElementById(id); } + if (typeof patron == 'undefined') patron = {}; patron.holds = function (params) { @@ -47,7 +49,7 @@ patron.holds.prototype = { 'current_copy' : { 'hidden' : false }, 'capture_time' : { 'hidden' : false }, 'notify_time' : { 'hidden' : false }, - 'notify_count' : { 'hidden' : false }, + 'notify_count' : { 'hidden' : false } } ); @@ -93,13 +95,13 @@ patron.holds.prototype = { 'id':row.my.ahr.id(), 'type':row.my.ahr.hold_type(), 'target':row.my.ahr.target(), - 'usr':row.my.ahr.usr(), + 'usr':row.my.ahr.usr() }) ); if (typeof params.on_retrieve == 'function') { params.on_retrieve(row); } } catch(E) { - obj.error.standard_unexpected_error_alert('Error retrieving details for hold #' + row.my.hold_id, E); + obj.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.holds.init.hold_num_error', [row.my.hold_id]), E); } } ); @@ -151,8 +153,7 @@ patron.holds.prototype = { obj.controller.view.cmd_holds_cancel.setAttribute('disabled','true'); obj.controller.view.cmd_show_catalog.setAttribute('disabled','true'); } - }, - + } } ); @@ -167,7 +168,7 @@ patron.holds.prototype = { ], 'cmd_broken' : [ ['command'], - function() { alert('Not Yet Implemented'); } + function() { alert($("commonStrings").getString('common.unimplemented')); } ], 'sel_patron' : [ ['command'], @@ -240,7 +241,7 @@ patron.holds.prototype = { ); } } catch(E) { - obj.error.standard_unexpected_error_alert('Error rendering/retrieving hold notifications.',E); + obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.holds.show_notifications.error_rendering_notifs'),E); } } ], @@ -272,12 +273,14 @@ patron.holds.prototype = { ml.setAttribute('id','selection'); ml.setAttribute('name','fancy_data'); var xml = ''; - xml += 'Please choose a Hold Range:'; + xml += '' + $("patronStrings").getString('staff.patron.holds.holds_edit_selection_depth.choose_hold_range') + ''; xml += util.widgets.serialize_node(ml); xml += ''; var bot_xml = ''; - bot_xml += '