From 64ec93087bea76e52b5beec1c858ffd7c165c1bb Mon Sep 17 00:00:00 2001 From: Kathy Lussier Date: Fri, 3 Aug 2018 13:17:33 -0400 Subject: [PATCH] LP#1538691: Use copies instead of items For better consistency for the terms used in the client, let's use copies instead of items. Signed-off-by: Kathy Lussier --- .../templates/staff/admin/workstation/t_log.tt2 | 8 ++--- .../staff/admin/workstation/t_print_templates.tt2 | 4 +-- Open-ILS/src/templates/staff/base_js.tt2 | 6 ++-- .../src/templates/staff/cat/bucket/copy/index.tt2 | 8 ++--- .../templates/staff/cat/bucket/copy/t_pending.tt2 | 4 +-- .../src/templates/staff/cat/bucket/copy/t_view.tt2 | 8 ++--- .../staff/cat/bucket/record/t_bucket_export.tt2 | 2 +- .../staff/cat/bucket/share/t_bucket_info.tt2 | 2 +- Open-ILS/src/templates/staff/cat/catalog/index.tt2 | 8 ++--- .../src/templates/staff/cat/catalog/t_catalog.tt2 | 4 +-- .../staff/cat/catalog/t_conjoined_selector.tt2 | 4 +-- .../src/templates/staff/cat/catalog/t_holdings.tt2 | 20 +++++------ .../src/templates/staff/cat/catalog/t_holds.tt2 | 4 +-- .../staff/cat/catalog/t_request_items.tt2 | 4 +-- Open-ILS/src/templates/staff/cat/item/index.tt2 | 42 +++++++++++----------- .../templates/staff/cat/item/missing_pieces.tt2 | 12 +++---- .../staff/cat/item/replace_barcode/index.tt2 | 2 +- .../templates/staff/cat/item/t_circ_list_pane.tt2 | 2 +- .../src/templates/staff/cat/item/t_holds_pane.tt2 | 4 +-- Open-ILS/src/templates/staff/cat/item/t_list.tt2 | 34 +++++++++--------- .../templates/staff/cat/item/t_summary_pane.tt2 | 2 +- .../src/templates/staff/cat/printlabels/index.tt2 | 4 +-- .../src/templates/staff/cat/printlabels/t_view.tt2 | 2 +- .../src/templates/staff/cat/share/t_marcedit.tt2 | 2 +- .../staff/cat/share/t_replace_barcode.tt2 | 8 ++--- .../src/templates/staff/cat/volcopy/t_defaults.tt2 | 2 +- .../src/templates/staff/circ/checkin/index.tt2 | 4 +-- .../src/templates/staff/circ/checkin/t_checkin.tt2 | 8 ++--- .../staff/circ/checkin/t_checkin_table.tt2 | 10 +++--- .../templates/staff/circ/checkin/t_hold_verify.tt2 | 2 +- .../src/templates/staff/circ/holds/t_pull_list.tt2 | 4 +-- .../templates/staff/circ/holds/t_shelf_list.tt2 | 4 +-- .../templates/staff/circ/patron/bucket/index.tt2 | 2 +- Open-ILS/src/templates/staff/circ/patron/index.tt2 | 10 +++--- .../templates/staff/circ/patron/t_bills_list.tt2 | 2 +- .../staff/circ/patron/t_edit_due_date_dialog.tt2 | 2 +- .../src/templates/staff/circ/patron/t_group.tt2 | 4 +-- .../templates/staff/circ/patron/t_holds_list.tt2 | 4 +-- .../templates/staff/circ/patron/t_items_out.tt2 | 4 +-- .../staff/circ/patron/t_renew_with_date_dialog.tt2 | 2 +- .../src/templates/staff/circ/patron/t_summary.tt2 | 2 +- .../templates/staff/circ/patron/t_xact_details.tt2 | 4 +-- .../src/templates/staff/circ/renew/t_renew.tt2 | 6 ++-- .../templates/staff/circ/share/circ_strings.tt2 | 8 ++--- .../staff/circ/share/t_hold_shelf_dialog.tt2 | 2 +- .../circ/share/t_mark_claims_returned_dialog.tt2 | 2 +- .../templates/staff/circ/share/t_mark_damaged.tt2 | 6 ++-- .../staff/circ/share/t_transit_dialog.tt2 | 2 +- .../src/templates/staff/circ/transits/t_list.tt2 | 4 +-- Open-ILS/src/templates/staff/navbar.tt2 | 10 +++--- Open-ILS/src/templates/staff/offline-interface.tt2 | 24 ++++++------- .../staff/share/print_templates/t_checkin.tt2 | 2 +- .../staff/share/print_templates/t_checkout.tt2 | 2 +- .../staff/share/print_templates/t_grid_html.tt2 | 2 +- .../share/print_templates/t_hold_shelf_list.tt2 | 2 +- .../share/print_templates/t_hold_shelf_slip.tt2 | 4 +-- .../share/print_templates/t_hold_transit_slip.tt2 | 2 +- .../share/print_templates/t_in_house_use_list.tt2 | 2 +- .../staff/share/print_templates/t_item_label.tt2 | 42 +++++++++++----------- .../staff/share/print_templates/t_item_status.tt2 | 4 +-- .../staff/share/print_templates/t_items_out.tt2 | 4 +-- .../share/print_templates/t_offline_checkin.tt2 | 2 +- .../share/print_templates/t_offline_checkout.tt2 | 2 +- .../print_templates/t_offline_in_house_use.tt2 | 2 +- .../share/print_templates/t_offline_renew.tt2 | 2 +- .../staff/share/print_templates/t_renew.tt2 | 2 +- .../staff/share/print_templates/t_transit_slip.tt2 | 2 +- Open-ILS/src/templates/staff/t_splash.tt2 | 6 ++-- 68 files changed, 209 insertions(+), 209 deletions(-) diff --git a/Open-ILS/src/templates/staff/admin/workstation/t_log.tt2 b/Open-ILS/src/templates/staff/admin/workstation/t_log.tt2 index 50c9bc54cb..721434088a 100644 --- a/Open-ILS/src/templates/staff/admin/workstation/t_log.tt2 +++ b/Open-ILS/src/templates/staff/admin/workstation/t_log.tt2 @@ -17,7 +17,7 @@ label="[% l('Refresh') %]"> + label="[% l('Retrieve Copy') %]"> @@ -26,7 +26,7 @@ - + @@ -43,7 +43,7 @@ dateformat="{{$root.egDateAndTimeFormat}}"> + label="[% l('Retrieve Copy') %]"> @@ -52,7 +52,7 @@ - + diff --git a/Open-ILS/src/templates/staff/admin/workstation/t_print_templates.tt2 b/Open-ILS/src/templates/staff/admin/workstation/t_print_templates.tt2 index 239ec26247..f37bfc02b8 100644 --- a/Open-ILS/src/templates/staff/admin/workstation/t_print_templates.tt2 +++ b/Open-ILS/src/templates/staff/admin/workstation/t_print_templates.tt2 @@ -26,8 +26,8 @@ - - + + diff --git a/Open-ILS/src/templates/staff/base_js.tt2 b/Open-ILS/src/templates/staff/base_js.tt2 index 51d9c42dc0..6aedc66c4b 100644 --- a/Open-ILS/src/templates/staff/base_js.tt2 +++ b/Open-ILS/src/templates/staff/base_js.tt2 @@ -134,11 +134,11 @@ UpUp.start({ s.OFFLINE_SESSION_UPLOAD_FAILED = "[% l('Offline transaction upload failed') %]"; s.PATRON_NOT_FOUND = "[% l('Patron not found') %]"; s.PATRON_BLOCKED = "[% l('Patron blocked') %]"; - s.BAD_BARCODE = "[% l('Bad item barcode') %]"; - s.BAD_BARCODE_CD = "[% l('Item barcode does not have a correct check digit.') %]"; + s.BAD_BARCODE = "[% l('Bad copy barcode') %]"; + s.BAD_BARCODE_CD = "[% l('Copy barcode does not have a correct check digit.') %]"; s.BAD_PATRON_BARCODE = "[% l('Bad patron barcode') %]"; s.BAD_PATRON_BARCODE_CD = "[% l('Patron barcode does not have a correct check digit.') %]"; - s.ITEM_NOT_FOUND = "[% l('Item not found') %]"; + s.ITEM_NOT_FOUND = "[% l('Copy not found') %]"; s.CONFIRM_CLEAR_PENDING = "[% l('Clear pending transactions') %]"; s.CONFIRM_CLEAR_PENDING_BODY = "[% l('Are you certain you want to clear these pending offline transactions? This action is irreversible. Transactions cannot be recovered after clearing!') %]"; s.LOCATION_NAME_OU_QUALIFIED = "[% l('{{location_name}} ({{owning_lib_shortname}})') %]"; diff --git a/Open-ILS/src/templates/staff/cat/bucket/copy/index.tt2 b/Open-ILS/src/templates/staff/cat/bucket/copy/index.tt2 index bcc0366285..cf5a190fcf 100644 --- a/Open-ILS/src/templates/staff/cat/bucket/copy/index.tt2 +++ b/Open-ILS/src/templates/staff/cat/bucket/copy/index.tt2 @@ -12,15 +12,15 @@ @@ -127,7 +127,7 @@ angular.module('egCoreMod').run(['egStrings', function(s) {
  • - [% l('Items Out') %] + [% l('Copies Out') %] ({{patron_stats().checkouts.total_out}}) diff --git a/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2 index c843bbb39e..f3a1ea0eae 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2 @@ -31,7 +31,7 @@ - --> diff --git a/Open-ILS/src/templates/staff/circ/patron/t_edit_due_date_dialog.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_edit_due_date_dialog.tt2 index e1384b752f..7af3f537ca 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_edit_due_date_dialog.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_edit_due_date_dialog.tt2 @@ -3,7 +3,7 @@

    - [% l('Edit Due Date For [_1] Items', '{{args.num_circs}}') %] + [% l('Edit Due Date For [_1] Copies', '{{args.num_circs}}') %]

    diff --git a/Open-ILS/src/templates/staff/circ/patron/t_group.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_group.tt2 index d70e746f6d..639d6927f2 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_group.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_group.tt2 @@ -39,8 +39,8 @@ - - + + diff --git a/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2 index 8f469103ce..c8e26850d0 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2 @@ -34,9 +34,9 @@ + label="[% l('Mark Copy Damaged') %]"> + label="[% l('Mark Copy Missing') %]"> diff --git a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2 index 33d3796647..4cb7e3a354 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2 @@ -6,7 +6,7 @@
    diff --git a/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 index f663db96e5..8996465ecf 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 @@ -89,7 +89,7 @@
    -
    [% l('Items Out') %]
    +
    [% l('Copies Out') %]
    {{patron_stats().checkouts.total_out}}
    -

    [% l('Item Summary') %]

    +

    [% l('Copy Summary') %]

    [% l('Barcode') %]
    - {{xact.circulation().target_copy().barcode()}} diff --git a/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 b/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 index 41866f41f8..a9f2c2db50 100644 --- a/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 +++ b/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 @@ -2,7 +2,7 @@
    - [% l('Renew Items') %] + [% l('Renew Copies') %]
    @@ -50,7 +50,7 @@ + label="[% l('Retrieve Last Patron Who Circulated Copy') %]"> + label="[% l('Mark Copies Damaged') %]">
    - [% l('Item Barcode:') %] + [% l('Copy Barcode:') %] {{copy.barcode}}
    diff --git a/Open-ILS/src/templates/staff/circ/share/t_mark_claims_returned_dialog.tt2 b/Open-ILS/src/templates/staff/circ/share/t_mark_claims_returned_dialog.tt2 index d2828a06ab..00b81e960d 100644 --- a/Open-ILS/src/templates/staff/circ/share/t_mark_claims_returned_dialog.tt2 +++ b/Open-ILS/src/templates/staff/circ/share/t_mark_claims_returned_dialog.tt2 @@ -2,7 +2,7 @@

    - [% l('Mark Item(s) Claims Returned') %] + [% l('Mark Copies Claims Returned') %]

    diff --git a/Open-ILS/src/templates/staff/circ/share/t_mark_damaged.tt2 b/Open-ILS/src/templates/staff/circ/share/t_mark_damaged.tt2 index 7506217532..4408e9b19c 100644 --- a/Open-ILS/src/templates/staff/circ/share/t_mark_damaged.tt2 +++ b/Open-ILS/src/templates/staff/circ/share/t_mark_damaged.tt2 @@ -2,13 +2,13 @@

    - [% l('Mark Item(s) Damaged') %] + [% l('Mark Copies Damaged') %]

    - [% l("Item [_1] will be marked damaged. ", "{{barcode}}") %] + [% l("Copy [_1] will be marked damaged. ", "{{barcode}}") %] [% l("Was returned ") %] [% l("on [_1] ","{{circ_checkin_time | date:'MM/dd/yy H:mm a'}}") %] [% l("for [_1] : [_2]. ", @@ -50,4 +50,4 @@
    -
    \ No newline at end of file +
    diff --git a/Open-ILS/src/templates/staff/circ/share/t_transit_dialog.tt2 b/Open-ILS/src/templates/staff/circ/share/t_transit_dialog.tt2 index 0d6da41c60..ca7afccb2f 100644 --- a/Open-ILS/src/templates/staff/circ/share/t_transit_dialog.tt2 +++ b/Open-ILS/src/templates/staff/circ/share/t_transit_dialog.tt2 @@ -30,7 +30,7 @@
    - [% l('Item Barcode:') %] + [% l('Copy Barcode:') %] {{copy.barcode}}
    diff --git a/Open-ILS/src/templates/staff/circ/transits/t_list.tt2 b/Open-ILS/src/templates/staff/circ/transits/t_list.tt2 index f4507bb181..9ba20d471a 100644 --- a/Open-ILS/src/templates/staff/circ/transits/t_list.tt2 +++ b/Open-ILS/src/templates/staff/circ/transits/t_list.tt2 @@ -34,9 +34,9 @@ dateformat="{{$root.egDateAndTimeFormat}}"> + label="[% l('Add Copies to Bucket') %]"> + label="[% l('Edit Copy Attributes') %]"> diff --git a/Open-ILS/src/templates/staff/navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2 index a6a65ad58c..3cb9a0acff 100644 --- a/Open-ILS/src/templates/staff/navbar.tt2 +++ b/Open-ILS/src/templates/staff/navbar.tt2 @@ -45,7 +45,7 @@
  • + eg-accesskey-desc="[% l('Copy Status') %]"> [% l('Search for Copies by Barcode') %] @@ -119,7 +119,7 @@ eg-accesskey="[% l('ctrl+f2') %]" eg-accesskey-desc="[% l('Renew items') %]"> - [% l('Renew Items') %] + [% l('Renew Copies') %]
  • @@ -127,7 +127,7 @@ eg-accesskey="[% l('ctrl+f2') %]" eg-accesskey-desc="[% l('Renew items') %]"> - [% l('Renew Items') %] + [% l('Renew Copies') %]
  • @@ -212,13 +212,13 @@
  • - [% l('Item Status') %] + [% l('Copy Status') %]
  • - [% l('Scan Item as Missing Pieces') %] + [% l('Scan Copy as Missing Pieces') %]
  • diff --git a/Open-ILS/src/templates/staff/offline-interface.tt2 b/Open-ILS/src/templates/staff/offline-interface.tt2 index 16424ce54c..7ce252e736 100644 --- a/Open-ILS/src/templates/staff/offline-interface.tt2 +++ b/Open-ILS/src/templates/staff/offline-interface.tt2 @@ -97,7 +97,7 @@ [% l('Type') %] [% l('Timestamp') %] [% l('Patron Barcode') %] - [% l('Item Barcode') %] + [% l('Copy Barcode') %] [% l('Non-cataloged Type') %] [% l('Checkout Date') %] [% l('Due Date') %] @@ -201,7 +201,7 @@ [% l('Timestamp') %] [% l('Event Name') %] [% l('Patron Barcode') %] - [% l('Item Barcode') %] + [% l('Copy Barcode') %] [% l('Non-cataloged Type') %] [% l('Checkout Date') %] [% l('Due Date') %] @@ -225,7 +225,7 @@ + ng-click="retrieveItem(xact.command.barcode)">[% l('Copy') %]