From: Kathy Lussier Date: Wed, 1 Aug 2018 17:14:32 +0000 (-0400) Subject: LP#1538691: Use items instead of copies X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=5d28b84c87d11cac205ec3b74f758e8824d77536;p=evergreen%2Fjoelewis.git LP#1538691: Use items instead of copies For better consistency for the terms used in the client, let's use items instead of copies, which was the preference of most people who provided feedback on bug 1538691. Signed-off-by: Kathy Lussier Conflicts: Open-ILS/src/templates/staff/cat/catalog/t_holds.tt2 Open-ILS/src/templates/staff/cat/item/t_list.tt2 Open-ILS/src/templates/staff/cat/item/t_summary_pane.tt2 Open-ILS/src/templates/staff/circ/holds/t_shelf_list.tt2 Signed-off-by: Dan Wells --- diff --git a/Open-ILS/src/templates/staff/admin/local/asset/copy_tag.tt2 b/Open-ILS/src/templates/staff/admin/local/asset/copy_tag.tt2 index 82d93bc441..d17d6dc9eb 100644 --- a/Open-ILS/src/templates/staff/admin/local/asset/copy_tag.tt2 +++ b/Open-ILS/src/templates/staff/admin/local/asset/copy_tag.tt2 @@ -1,6 +1,6 @@ [% WRAPPER "staff/base.tt2"; - ctx.page_title = l("Copy Tags"); + ctx.page_title = l("Item Tags"); ctx.page_app = "egAdminConfig"; ctx.page_ctrl = 'CopyTag'; %] @@ -15,7 +15,7 @@
- [% l('Copy Tags') %] + [% l('Item Tags') %]
diff --git a/Open-ILS/src/templates/staff/admin/local/autoGridEditor/acas.tt2 b/Open-ILS/src/templates/staff/admin/local/autoGridEditor/acas.tt2 index 7733249477..27023661a0 100644 --- a/Open-ILS/src/templates/staff/admin/local/autoGridEditor/acas.tt2 +++ b/Open-ILS/src/templates/staff/admin/local/autoGridEditor/acas.tt2 @@ -1,12 +1,12 @@ -[% ctx.page_title = l("Copy Alert Suppression"); %] +[% ctx.page_title = l("Item Alert Suppression"); %]
-

[% l('Create copy alert suppression rule') %]

-

[% l('Update copy alert suppression rule') %]

+

[% l('Create item alert suppression rule') %]

+

[% l('Update item alert suppression rule') %]

diff --git a/Open-ILS/src/templates/staff/admin/local/autoGridEditor/ccat.tt2 b/Open-ILS/src/templates/staff/admin/local/autoGridEditor/ccat.tt2 index 6eb816de9e..4ca9b8b019 100644 --- a/Open-ILS/src/templates/staff/admin/local/autoGridEditor/ccat.tt2 +++ b/Open-ILS/src/templates/staff/admin/local/autoGridEditor/ccat.tt2 @@ -1,12 +1,12 @@ -[% ctx.page_title = l("Copy Alert Types"); %] +[% ctx.page_title = l("Item Alert Types"); %]
-

[% l('Create copy alert type') %]

-

[% l('Update copy alert type') %]

+

[% l('Create item alert type') %]

+

[% l('Update item alert type') %]

diff --git a/Open-ILS/src/templates/staff/admin/local/t_splash.tt2 b/Open-ILS/src/templates/staff/admin/local/t_splash.tt2 index 90ec95af66..7407a7b596 100644 --- a/Open-ILS/src/templates/staff/admin/local/t_splash.tt2 +++ b/Open-ILS/src/templates/staff/admin/local/t_splash.tt2 @@ -17,12 +17,12 @@ ,[ l('Circ Limit Sets'), "./admin/local/config/circ_limit_set" ] ,[ l('Circulation Policies'), "./admin/local/config/circ_matrix_matchpoint" ] ,[ l('Closed Dates Editor'), "./admin/local/actor/closed_dates" ] - ,[ l('Copy Alert Types'), "./admin/local/config/copy_alert_types" ] - ,[ l('Copy Alert Suppression'), "./admin/local/actor/copy_alert_suppress" ] + ,[ l('Item Alert Types'), "./admin/local/config/copy_alert_types" ] + ,[ l('Item Alert Suppression'), "./admin/local/actor/copy_alert_suppress" ] ,[ l('Copy Location Groups'), "./admin/local/asset/copy_location_group" ] ,[ l('Copy Location Order'), "./admin/local/asset/copy_location_order" ] ,[ l('Copy Locations Editor'), "./admin/local/asset/copy_locations" ] - ,[ l('Copy Tags'), "./admin/local/asset/copy_tag" ] + ,[ l('Item Tags'), "./admin/local/asset/copy_tag" ] ,[ l('Field Documentation'), "./admin/local/config/idl_field_doc" ] ,[ l('Group Penalty Thresholds'), "./admin/local/permission/grp_penalty_threshold" ] ,[ l('Hold Policies'), "./admin/local/config/hold_matrix_matchpoint" ] @@ -37,7 +37,7 @@ ,[ l('Statistical Popularity Badges'), "./admin/local/rating/badge" ] ,[ l('Surveys'), "./admin/local/action/survey" ] ,[ l('Transit List'), "./circ/transits/list" ] - ,[ l('Volume/Copy Template Editor'), "./cat/volcopy/edit_templates" ] + ,[ l('Volume/Item Template Editor'), "./cat/volcopy/edit_templates" ] ,[ l('Work Log'), "./admin/workstation/log" ] ]; diff --git a/Open-ILS/src/templates/staff/admin/serials/t_splash.tt2 b/Open-ILS/src/templates/staff/admin/serials/t_splash.tt2 index 308a31d8b1..7477ed872c 100644 --- a/Open-ILS/src/templates/staff/admin/serials/t_splash.tt2 +++ b/Open-ILS/src/templates/staff/admin/serials/t_splash.tt2 @@ -9,7 +9,7 @@ [% interfaces = [ - [ l('Serial Copy Templates'), "./admin/serials/templates" ] + [ l('Serial Item Templates'), "./admin/serials/templates" ] [ l('Prediction Pattern Templates'), "./admin/serials/pattern_template" ] ]; diff --git a/Open-ILS/src/templates/staff/admin/server/config/copy_tag_type.tt2 b/Open-ILS/src/templates/staff/admin/server/config/copy_tag_type.tt2 index 676083d316..37d6c824c4 100644 --- a/Open-ILS/src/templates/staff/admin/server/config/copy_tag_type.tt2 +++ b/Open-ILS/src/templates/staff/admin/server/config/copy_tag_type.tt2 @@ -1,6 +1,6 @@ [% WRAPPER "staff/base.tt2"; - ctx.page_title = l("Copy Tag Types"); + ctx.page_title = l("Item Tag Types"); ctx.page_app = "egAdminConfig"; ctx.page_ctrl = 'CopyTagType'; %] @@ -15,7 +15,7 @@
- [% l('Copy Tag Types') %] + [% l('Item Tag Types') %]
diff --git a/Open-ILS/src/templates/staff/admin/server/t_splash.tt2 b/Open-ILS/src/templates/staff/admin/server/t_splash.tt2 index 44013fea52..c03666f6b5 100644 --- a/Open-ILS/src/templates/staff/admin/server/t_splash.tt2 +++ b/Open-ILS/src/templates/staff/admin/server/t_splash.tt2 @@ -26,8 +26,8 @@ ,[ l('Circulation Max Fine Rules'), "./admin/server/config/rule_max_fine" ] ,[ l('Circulation Modifiers'), "./admin/server/config/circ_modifier" ] ,[ l('Circulation Recurring Fine Rules'), "./admin/server/config/rule_recurring_fine" ] - ,[ l('Copy Statuses'), "./admin/server/legacy/config/copy_status" ] - ,[ l('Copy Tag Types'), "./admin/server/config/copy_tag_type" ] + ,[ l('Item Statuses'), "./admin/server/legacy/config/copy_status" ] + ,[ l('Item Tag Types'), "./admin/server/config/copy_tag_type" ] ,[ l('Custom Org Unit Trees'), "./admin/server/actor/org_unit_custom_tree" ] ,[ l('Floating Groups'), "./admin/server/config/floating_groups" ] ,[ l('Global Flags'), "./admin/server/config/global_flag" ] diff --git a/Open-ILS/src/templates/staff/admin/workstation/t_print_config.tt2 b/Open-ILS/src/templates/staff/admin/workstation/t_print_config.tt2 index 8cd6bf9747..043a446305 100644 --- a/Open-ILS/src/templates/staff/admin/workstation/t_print_config.tt2 +++ b/Open-ILS/src/templates/staff/admin/workstation/t_print_config.tt2 @@ -230,7 +230,7 @@
- +
  • - [% l('Pending Copies') %] + [% l('Pending Items') %] ({{bucketSvc.pendingList.length}})
    • diff --git a/Open-ILS/src/templates/staff/cat/bucket/copy/t_apply_tags.tt2 b/Open-ILS/src/templates/staff/cat/bucket/copy/t_apply_tags.tt2 index 64a689186c..e218adee42 100644 --- a/Open-ILS/src/templates/staff/cat/bucket/copy/t_apply_tags.tt2 +++ b/Open-ILS/src/templates/staff/cat/bucket/copy/t_apply_tags.tt2 @@ -2,7 +2,7 @@
    -

    [% l('Apply Copy Tags') %]

    +

    [% l('Apply Item Tags') %]

      diff --git a/Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2 b/Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2 index 99a3584ce5..8f2bbe2ab3 100644 --- a/Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2 +++ b/Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2 @@ -10,17 +10,17 @@ [% INCLUDE 'staff/cat/bucket/copy/t_grid_menu.tt2' %] - - - - - diff --git a/Open-ILS/src/templates/staff/cat/catalog/index.tt2 b/Open-ILS/src/templates/staff/cat/catalog/index.tt2 index f2c75f79ff..ec7690587e 100644 --- a/Open-ILS/src/templates/staff/cat/catalog/index.tt2 +++ b/Open-ILS/src/templates/staff/cat/catalog/index.tt2 @@ -27,13 +27,13 @@
      @@ -46,11 +46,11 @@
      [% l('Prefix') %]
      [% l('Call Number') %]
      [% l('Suffix') %]
      -
      [% l('Copies') %]
      +
      [% l('Items') %]
      [% l('Barcode') %]
      -
      [% l('Copy #') %]
      +
      [% l('Item #') %]
      [% l('Part') %]
      @@ -87,10 +87,10 @@ @@ -125,7 +125,7 @@ - + @@ -169,7 +169,7 @@ - +
    diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_view.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_view.tt2 index d033666dcb..0226696a5b 100644 --- a/Open-ILS/src/templates/staff/cat/volcopy/t_view.tt2 +++ b/Open-ILS/src/templates/staff/cat/volcopy/t_view.tt2 @@ -18,7 +18,7 @@ eg-navbar { [% l('Edit') %]
  • - [% l('Copy Templates') %] + [% l('Item Templates') %]
  • [% l('Defaults') %] @@ -42,7 +42,7 @@ eg-navbar {
    -

    [% l("Edit Volume/Copy Templates") %]

    +

    [% l("Edit Volume/Item Templates") %]

    diff --git a/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2 b/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2 index 2d0aa30bc5..716e408b65 100644 --- a/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2 +++ b/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2 @@ -33,11 +33,11 @@ + label="[% l('Add Item Alerts') %]"> + label="[% l('Manage Item Alerts') %]"> diff --git a/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2 b/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2 index 2da31950b9..54e6362224 100644 --- a/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2 +++ b/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2 @@ -26,7 +26,7 @@ label="[% l('Retrieve Patron') %]"> + label="[% l('Set Desired Item Quality') %]"> + label="[% l('Set Desired Item Quality') %]"> - {{item.hold.cp_barcode}} @@ -80,11 +80,11 @@ - + - + diff --git a/Open-ILS/src/templates/staff/circ/in_house_use/index.tt2 b/Open-ILS/src/templates/staff/circ/in_house_use/index.tt2 index 3af529e760..5f4e873c1a 100644 --- a/Open-ILS/src/templates/staff/circ/in_house_use/index.tt2 +++ b/Open-ILS/src/templates/staff/circ/in_house_use/index.tt2 @@ -63,7 +63,7 @@
    -
    [% l('Copy Not Found') %]
    +
    [% l('Item Not Found') %]
    - +
    diff --git a/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2 index b143175a30..58e3322e95 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2 @@ -121,7 +121,7 @@ not sure what's up, there. -->
    - + 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 6c3d2c15f7..a29aa3d381 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 @@ -24,7 +24,7 @@ + + label="[% l('Add Item Alerts') %]"> + label="[% l('Manage Item Alerts') %]"> + label="[% l('Set Desired Item Quality') %]"> - {{item.hold.current_copy().barcode()}} @@ -70,7 +70,7 @@ - + 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..5a5aee9e36 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 @@ -95,7 +95,7 @@ - + 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..886e93fdbb 100644 --- a/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 +++ b/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 @@ -69,11 +69,11 @@ + label="[% l('Add Item Alerts') %]"> + label="[% l('Manage Item Alerts') %]"> diff --git a/Open-ILS/src/templates/staff/circ/share/circ_strings.tt2 b/Open-ILS/src/templates/staff/circ/share/circ_strings.tt2 index 6675b99c12..592365ba7f 100644 --- a/Open-ILS/src/templates/staff/circ/share/circ_strings.tt2 +++ b/Open-ILS/src/templates/staff/circ/share/circ_strings.tt2 @@ -11,13 +11,13 @@ s.PATRON_ACCOUNT_EXPIRED = s.CIRC_CLAIMS_RETURNED = '[% l('Item "[_1]" is marked as Claims Returned', '{{barcode}}') %]'; s.CHECKOUT_FAILED_GENERIC = - '[% l('Unable to checkout copy "[_1]" : [_2]', '{{barcode}}', '{{textcode}}') %]'; + '[% l('Unable to checkout item "[_1]" : [_2]', '{{barcode}}', '{{textcode}}') %]'; s.EMAILED_CHECKOUT_RECEIPT = "[% l('Emailed checkout receipt') %]"; s.COPY_ALERT_MSG_DIALOG_TITLE = - '[% l('Copy Alert Message for "[_1]"', '{{copy_barcode}}') %]'; + '[% l('Item Alert Message for "[_1]"', '{{copy_barcode}}') %]'; s.UNCAT_ALERT_DIALOG = - '[% l('Copy "[_1]" was mis-scanned or is not cataloged', '{{copy_barcode}}') %]'; + '[% l('Item "[_1]" was mis-scanned or is not cataloged', '{{copy_barcode}}') %]'; s.PERMISSION_DENIED = '[% l('Permission Denied : [_1]', '{{permission}}') %]'; s.PRECAT_CHECKIN_MSG = @@ -30,7 +30,7 @@ s.MARK_MISSING_CONFIRM = '[% l("Mark {{num_items}} items as MISSING?") %]'; s.ABORT_TRANSIT_CONFIRM = '[% l("Cancel {{num_transits}} transits?") %]'; s.ROUTE_TO_HOLDS_SHELF = '[% l("Holds Shelf") %]'; s.ROUTE_TO_CATALOGING = '[% l("Cataloging") %]'; -s.COPY_IN_TRANSIT = '[% l("Copy is In-Transit") %]'; +s.COPY_IN_TRANSIT = '[% l("Item is In-Transit") %]'; s.TOO_MANY_CLAIMS_RETURNED = '[% l("Patron exceeds claims returned count. Force this action?") %]'; s.MARK_NEVER_CHECKED_OUT = @@ -38,23 +38,23 @@ s.MARK_NEVER_CHECKED_OUT = s.ON_DEMAND_COPY_ALERT = { 'CHECKIN': { 'NORMAL' : '[% l("Normal checkin") %]', - 'LOST' : '[% l("Copy was marked lost") %]', - 'LOST_AND_PAID' : '[% l("Copy was marked lost and paid for") %]', - 'MISSING' : '[% l("Copy was marked missing") %]', - 'DAMAGED' : '[% l("Copy was marked damaged") %]', - 'CLAIMSRETURNED' : '[% l("Copy was marked claims returned") %]', - 'LONGOVERDUE' : '[% l("Copy was marked long overdue") %]', - 'CLAIMSNEVERCHECKEDOUT' : '[% l("Copy was marked claims never checked out") %]' + 'LOST' : '[% l("Item was marked lost") %]', + 'LOST_AND_PAID' : '[% l("Item was marked lost and paid for") %]', + 'MISSING' : '[% l("Item was marked missing") %]', + 'DAMAGED' : '[% l("Item was marked damaged") %]', + 'CLAIMSRETURNED' : '[% l("Item was marked claims returned") %]', + 'LONGOVERDUE' : '[% l("Item was marked long overdue") %]', + 'CLAIMSNEVERCHECKEDOUT' : '[% l("Item was marked claims never checked out") %]' }, 'CHECKOUT': { 'NORMAL' : '[% l("Normal checkout") %]', - 'LOST' : '[% l("Copy was marked lost") %]', - 'LOST_AND_PAID' : '[% l("Copy was marked lost and paid for") %]', - 'MISSING' : '[% l("Copy was marked missing") %]', - 'DAMAGED' : '[% l("Copy was marked damaged") %]', - 'CLAIMSRETURNED' : '[% l("Copy was marked claims returned") %]', - 'LONGOVERDUE' : '[% l("Copy was marked long overdue") %]', - 'CLAIMSNEVERCHECKEDOUT' : '[% l("Copy was marked claims never checked out") %]' + 'LOST' : '[% l("Item was marked lost") %]', + 'LOST_AND_PAID' : '[% l("Item was marked lost and paid for") %]', + 'MISSING' : '[% l("Item was marked missing") %]', + 'DAMAGED' : '[% l("Item was marked damaged") %]', + 'CLAIMSRETURNED' : '[% l("Item was marked claims returned") %]', + 'LONGOVERDUE' : '[% l("Item was marked long overdue") %]', + 'CLAIMSNEVERCHECKEDOUT' : '[% l("Item was marked claims never checked out") %]' } }; }]); diff --git a/Open-ILS/src/templates/staff/circ/share/hold_strings.tt2 b/Open-ILS/src/templates/staff/circ/share/hold_strings.tt2 index 647dac77ff..5bb570f96e 100644 --- a/Open-ILS/src/templates/staff/circ/share/hold_strings.tt2 +++ b/Open-ILS/src/templates/staff/circ/share/hold_strings.tt2 @@ -3,7 +3,7 @@