From 5f90b07e588fffa5428ae8bcd9d4445e3150b01b Mon Sep 17 00:00:00 2001 From: Kathy Lussier <klussier@masslnc.org> Date: Wed, 22 Aug 2018 16:48:43 -0400 Subject: [PATCH] LP#1538691: More changes to terminology For more consistency: Changing all staff client instances of Copy Location to Shelving Location. We also replace Volume with Call Number and use Holdings for a combination of copies/volumes. Also replacing the 'Add Copies' option on the bib record page with 'Add Holdings' as was previously discussed on the open-ils-general list. Signed-off-by: Kathy Lussier <klussier@masslnc.org> Signed-off-by: Dan Wells <dbw2@calvin.edu> --- .../conify/global/asset/copy_location_group.tt2 | 6 +++--- .../conify/global/asset/copy_location_order.tt2 | 4 ++-- .../src/templates/staff/admin/local/t_splash.tt2 | 8 ++++---- .../src/templates/staff/cat/bucket/copy/index.tt2 | 2 +- .../src/templates/staff/cat/bucket/copy/t_view.tt2 | 2 +- Open-ILS/src/templates/staff/cat/catalog/index.tt2 | 8 ++++---- .../src/templates/staff/cat/catalog/t_catalog.tt2 | 2 +- .../staff/cat/catalog/t_choose_vol_target_lib.tt2 | 2 +- .../src/templates/staff/cat/catalog/t_holdings.tt2 | 22 +++++++++++----------- Open-ILS/src/templates/staff/cat/item/index.tt2 | 18 +++++++++--------- .../staff/cat/share/t_embedded_volcopy.tt2 | 2 +- .../templates/staff/cat/share/t_volume_list.tt2 | 4 ++-- Open-ILS/src/templates/staff/cat/volcopy/index.tt2 | 6 +++--- .../templates/staff/cat/volcopy/t_attr_edit.tt2 | 2 +- .../src/templates/staff/cat/volcopy/t_defaults.tt2 | 4 ++-- .../src/templates/staff/cat/volcopy/t_edit.tt2 | 10 +++++----- .../src/templates/staff/cat/volcopy/t_view.tt2 | 2 +- .../staff/circ/checkin/t_checkin_table.tt2 | 2 +- .../src/templates/staff/circ/holds/t_pull_list.tt2 | 2 +- .../templates/staff/circ/share/t_hold_details.tt2 | 2 +- .../src/templates/staff/circ/transits/t_list.tt2 | 2 +- Open-ILS/src/templates/staff/css/cat.css.tt2 | 2 +- .../templates/staff/serials/t_batch_receive.tt2 | 2 +- Open-ILS/web/opac/locale/en-US/lang.dtd | 4 ++-- 24 files changed, 60 insertions(+), 60 deletions(-) diff --git a/Open-ILS/src/templates/conify/global/asset/copy_location_group.tt2 b/Open-ILS/src/templates/conify/global/asset/copy_location_group.tt2 index 560a4c4e0c..43c5bd19a1 100644 --- a/Open-ILS/src/templates/conify/global/asset/copy_location_group.tt2 +++ b/Open-ILS/src/templates/conify/global/asset/copy_location_group.tt2 @@ -1,5 +1,5 @@ [% WRAPPER base.tt2 %] -[% ctx.page_title = l('Copy Location Group') %] +[% ctx.page_title = l('Shelving Location Group') %] <script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/asset/copy_location_group.js'> </script> <link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/js/dojo/dojo/resources/dnd.css'/> <style> @@ -54,7 +54,7 @@ </style> <div id='acplg-header'> - <span>[% l('Copy Location Groups') %]</span> + <span>[% l('Shelving Location Groups') %]</span> <select dojoType="openils.widget.OrgUnitFilteringSelect" jsId='contextOrgSelector' searchAttr='shortname' @@ -95,7 +95,7 @@ <div> <table width='100%'><tr> <td align='left'><button onclick='editLocations("create")'>[% l('← Add') %]</button></td> - <td align='right' style='padding-right:5px;'>[% l('Copy Locations') %]</td> + <td align='right' style='padding-right:5px;'>[% l('Shelving Locations') %]</td> </tr></table> </div> <div style='height:400px; overflow-y:scroll'> diff --git a/Open-ILS/src/templates/conify/global/asset/copy_location_order.tt2 b/Open-ILS/src/templates/conify/global/asset/copy_location_order.tt2 index 97304b7005..c77a23f264 100644 --- a/Open-ILS/src/templates/conify/global/asset/copy_location_order.tt2 +++ b/Open-ILS/src/templates/conify/global/asset/copy_location_order.tt2 @@ -1,10 +1,10 @@ [% WRAPPER base.tt2 %] -[% ctx.page_title = l('Copy Location Order') %] +[% ctx.page_title = l('Shelving Location Order') %] <script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/asset/copy_location_order.js'> </script> <link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/js/dojo/dojo/resources/dnd.css'/> <div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'> - <div>[% l('Copy Location Order') %]</div> + <div>[% l('Shelving Location Order') %]</div> <div></div> </div> 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 7407a7b596..d9616c8906 100644 --- a/Open-ILS/src/templates/staff/admin/local/t_splash.tt2 +++ b/Open-ILS/src/templates/staff/admin/local/t_splash.tt2 @@ -19,9 +19,9 @@ ,[ l('Closed Dates Editor'), "./admin/local/actor/closed_dates" ] ,[ 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('Shelving Location Groups'), "./admin/local/asset/copy_location_group" ] + ,[ l('Shelving Location Order'), "./admin/local/asset/copy_location_order" ] + ,[ l('Shelving Locations Editor'), "./admin/local/asset/copy_locations" ] ,[ 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" ] @@ -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/Item Template Editor'), "./cat/volcopy/edit_templates" ] + ,[ l('Holdings Template Editor'), "./cat/volcopy/edit_templates" ] ,[ l('Work Log'), "./admin/workstation/log" ] ]; 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 35b2d30c08..91d2f204fc 100644 --- a/Open-ILS/src/templates/staff/cat/bucket/copy/index.tt2 +++ b/Open-ILS/src/templates/staff/cat/bucket/copy/index.tt2 @@ -18,7 +18,7 @@ s.OVERRIDE_DELETE_COPY_BUCKET_ITEMS_FROM_CATALOG_BODY = "[% l('Reason(s) include: [_1]', '{{evt_desc}}') %]"; s.CONFIRM_TRANSFER_COPY_BUCKET_ITEMS_TO_MARKED_VOLUME = - "[% l('Are you sure you want to transfer selected items to the marked volume?') %]"; + "[% l('Are you sure you want to transfer selected items to the marked call number?') %]"; s.OVERRIDE_TRANSFER_COPY_BUCKET_ITEMS_TO_MARKED_VOLUME_TITLE = "[% l('One or more items could not be transferred. Override?') %]"; s.OVERRIDE_TRANSFER_COPY_BUCKET_ITEMS_TO_MARKED_VOLUME_BODY = 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 8f2bbe2ab3..edb83bcae2 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 @@ -18,7 +18,7 @@ handler="spawnHoldingsEdit"></eg-grid-action> <eg-grid-action handler="print_labels" group="[% l('Show') %]" label="[% l('Print Labels') %]"></eg-grid-action> - <eg-grid-action label="[% l('Transfer Selected Items to Marked Volume') %]" group="[% l('Items') %]" + <eg-grid-action label="[% l('Transfer Selected Items to Marked Call Number') %]" group="[% l('Items') %]" handler="transferCopies"></eg-grid-action> <eg-grid-action label="[% l('Delete Selected Items from Catalog') %]" group="[% l('Items') %]" handler="deleteCopiesFromCatalog"></eg-grid-action> diff --git a/Open-ILS/src/templates/staff/cat/catalog/index.tt2 b/Open-ILS/src/templates/staff/cat/catalog/index.tt2 index ec7690587e..ddb6a8c847 100644 --- a/Open-ILS/src/templates/staff/cat/catalog/index.tt2 +++ b/Open-ILS/src/templates/staff/cat/catalog/index.tt2 @@ -27,21 +27,21 @@ <script> angular.module('egCoreMod').run(['egStrings', function(s) { s.CONFIRM_DELETE_COPIES_VOLUMES = - "[% l('Permanently delete selected items and/or volumes from catalog?') %]"; + "[% l('Permanently delete selected items and/or call numbers from catalog?') %]"; s.CONFIRM_DELETE_COPIES_VOLUMES_MESSAGE = - "[% l('Will delete {{copies}} items and {{volumes}} volumes') %]"; + "[% l('Will delete {{copies}} items and {{volumes}} call numbers') %]"; s.CONFIRM_DELETE_PEERS = "[% l('Unlink selected conjoined items?') %]"; s.CONFIRM_DELETE_PEERS_MESSAGE = "[% l('Will unlink {{peers}} items') %]"; s.CONFIRM_TRANSFER_COPIES_TO_MARKED_VOLUME = - "[% l('Are you sure you want to transfer selected items to the marked volume?') %]"; + "[% l('Are you sure you want to transfer selected items to the marked call number?') %]"; s.OVERRIDE_TRANSFER_COPIES_TO_MARKED_VOLUME_TITLE = "[% l('One or more items could not be transferred. Override?') %]"; s.OVERRIDE_TRANSFER_COPIES_TO_MARKED_VOLUME_BODY = "[% l('Reason(s) include: [_1]', '{{evt_desc}}') %]"; s.VOLS_TRANSFERED = - "[% l('Volume(s) transfered') %]"; + "[% l('Call Number(s) transfered') %]"; s.ITEMS_TRANSFERED = "[% l('Item(s) transfered') %]"; s.HOLD_TRANSFER_DEST_MARKED = diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2 index 500575b115..c9b733d733 100644 --- a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2 +++ b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2 @@ -24,7 +24,7 @@ <div class="col-md-6"> <div class="pull-right"> <button type="button" class="btn btn-default" ng-click="selectedHoldingsVolCopyAdd()"> - [% l('Add Items') %] + [% l('Add Holdings') %] </button> <div class="btn-group" uib-dropdown dropdown-append-to-body> <button id="serials-button" type="button" class="btn btn-default" uib-dropdown-toggle> diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_choose_vol_target_lib.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_choose_vol_target_lib.tt2 index 74e02c0bf4..0191d70092 100644 --- a/Open-ILS/src/templates/staff/cat/catalog/t_choose_vol_target_lib.tt2 +++ b/Open-ILS/src/templates/staff/cat/catalog/t_choose_vol_target_lib.tt2 @@ -2,7 +2,7 @@ <div class="modal-header"> <button type="button" class="close" ng-click="cancel()" aria-hidden="true">×</button> - <h4 class="modal-title">[% l('Choose volume transfer target') %]</h4> + <h4 class="modal-title">[% l('Choose call number transfer target') %]</h4> </div> <div class="modal-body"> <div class="row"> diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2 index 8c41ea6777..191261767e 100644 --- a/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2 +++ b/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2 @@ -19,7 +19,7 @@ persist-key="cat.holdings"> <eg-grid-menu-item handler="holdings_checkbox_handler" - label="[% l('Show empty volumes') %]" + label="[% l('Show empty call numbers') %]" checkbox="holdings_show_empty" checked="holdings_show_empty"/> @@ -29,12 +29,12 @@ checked="holdings_show_empty_org"/> <eg-grid-menu-item handler="holdings_checkbox_handler" - label="[% l('Show Item detail') %]" + label="[% l('Show item detail') %]" checkbox="holdings_show_copies" checked="holdings_show_copies"/> <eg-grid-menu-item handler="holdings_checkbox_handler" - label="[% l('Show volume detail') %]" + label="[% l('Show call number detail') %]" checkbox="holdings_show_vols" checked="holdings_show_vols"/> @@ -65,37 +65,37 @@ <eg-grid-action handler="selectedHoldingsMissing" group="[% l('Mark') %]" label="[% l('Item as Missing') %]"></eg-grid-action> <eg-grid-action handler="markFromSelectedAsHoldingsTarget" group="[% l('Mark') %]" - label="[% l('Library/Volume as Transfer Destination') %]"></eg-grid-action> + label="[% l('Library/Call Number as Transfer Destination') %]"></eg-grid-action> <eg-grid-action handler="selectedHoldingsVolAdd" group="[% l('Add') %]" - label="[% l('Volumes') %]"></eg-grid-action> + label="[% l('Call Numbers') %]"></eg-grid-action> <eg-grid-action handler="selectedHoldingsCopyAdd" group="[% l('Add') %]" disabled="vols_not_shown" label="[% l('Items') %]"></eg-grid-action> <eg-grid-action handler="selectedHoldingsVolCopyAdd" group="[% l('Add') %]" - label="[% l('Volumes and Items') %]"></eg-grid-action> + label="[% l('Call Numbers and Items') %]"></eg-grid-action> <eg-grid-action handler="selectedHoldingsCopyAlertsAdd" group="[% l('Add') %]" disabled="vols_not_shown" label="[% l('Item Alerts') %]"></eg-grid-action> <eg-grid-action handler="selectedHoldingsVolEdit" group="[% l('Edit') %]" - label="[% l('Volumes') %]"></eg-grid-action> + label="[% l('Call Numbers') %]"></eg-grid-action> <eg-grid-action handler="selectedHoldingsCopyEdit" group="[% l('Edit') %]" label="[% l('Items') %]"></eg-grid-action> <eg-grid-action handler="selectedHoldingsVolCopyEdit" group="[% l('Edit') %]" - label="[% l('Volumes and Items') %]"></eg-grid-action> + label="[% l('Call Numbers and Items') %]"></eg-grid-action> <eg-grid-action handler="replaceBarcodes" group="[% l('Edit') %]" label="[% l('Replace Barcodes') %]"></eg-grid-action> <eg-grid-action handler="selectedHoldingsCopyAlertsManage" group="[% l('Edit') %]" label="[% l('Manage Item Alerts') %]"></eg-grid-action> <eg-grid-action handler="selectedHoldingsEmptyVolCopyDelete" group="[% l('Delete') %]" disabled="vols_not_shown" - label="[% l('Empty Volumes') %]"></eg-grid-action> + label="[% l('Empty Call Numbers') %]"></eg-grid-action> <eg-grid-action handler="selectedHoldingsCopyDelete" group="[% l('Delete') %]" disabled="copies_not_shown" label="[% l('Items') %]"></eg-grid-action> <eg-grid-action handler="selectedHoldingsVolCopyDelete" group="[% l('Delete') %]" disabled="copies_not_shown" - label="[% l('Volumes and Items') %]"></eg-grid-action> + label="[% l('Call Numbers and Items') %]"></eg-grid-action> <eg-grid-action handler="transferVolumes" group="[% l('Transfer') %]" - label="[% l('Volumes to Previously Marked Destination') %]"></eg-grid-action> + label="[% l('Call Numbers to Previously Marked Destination') %]"></eg-grid-action> <eg-grid-action handler="transferItems" group="[% l('Transfer') %]" label="[% l('Items to Previously Marked Destination') %]"></eg-grid-action> diff --git a/Open-ILS/src/templates/staff/cat/item/index.tt2 b/Open-ILS/src/templates/staff/cat/item/index.tt2 index c66174260f..0a782812fc 100644 --- a/Open-ILS/src/templates/staff/cat/item/index.tt2 +++ b/Open-ILS/src/templates/staff/cat/item/index.tt2 @@ -19,15 +19,15 @@ <script> angular.module('egCoreMod').run(['egStrings', function(s) { s.CONFIRM_DELETE_COPIES_VOLUMES = - "[% l('Permanently delete selected copies and/or volumes from catalog?') %]"; + "[% l('Permanently delete selected items and/or call numbers from catalog?') %]"; s.CONFIRM_DELETE_COPIES_VOLUMES_MESSAGE = - "[% l('Will delete {{copies}} copies and {{volumes}} volumes') %]"; + "[% l('Will delete {{copies}} items and {{volumes}} call numbers') %]"; s.CONFIRM_DELETE_PEERS = - "[% l('Unlink selected conjoined copies?') %]"; + "[% l('Unlink selected conjoined items?') %]"; s.CONFIRM_DELETE_PEERS_MESSAGE = - "[% l('Will unlink {{peers}} copies') %]"; + "[% l('Will unlink {{peers}} items') %]"; s.CONFIRM_TRANSFER_COPIES_TO_MARKED_VOLUME = - "[% l('Are you sure you want to transfer selected items to the marked volume?') %]"; + "[% l('Are you sure you want to transfer selected items to the marked call number?') %]"; s.OVERRIDE_TRANSFER_COPIES_TO_MARKED_VOLUME_TITLE = "[% l('One or more items could not be transferred. Override?') %]"; s.OVERRIDE_TRANSFER_COPIES_TO_MARKED_VOLUME_BODY = @@ -96,17 +96,17 @@ <p><b>[% l('Add') %]</b></p> <li><a href ng-click="selectedHoldingsCopyAdd()">[% l('Items') %]</a></li> - <li><a href ng-click="selectedHoldingsVolCopyAdd()">[% l('Volumes and Items') %]</a></li> + <li><a href ng-click="selectedHoldingsVolCopyAdd()">[% l('Call Numbers and Items') %]</a></li> <p><b>[% l('Edit') %]</b></p> - <li><a href ng-click="selectedHoldingsVolEdit()">[% l('Volumes') %]</a></li> + <li><a href ng-click="selectedHoldingsVolEdit()">[% l('Call Numbers') %]</a></li> <li><a href ng-click="selectedHoldingsCopyEdit()">[% l('Items') %]</a></li> - <li><a href ng-click="selectedHoldingsVolCopyEdit()">[% l('Volumes and Items') %]</a></li> + <li><a href ng-click="selectedHoldingsVolCopyEdit()">[% l('Call Numbers and Items') %]</a></li> <li><a href ng-click="replaceBarcodes()">[% l('Replace Barcodes') %]</a></li> <p><b>[% l('Transfer') %]</b></p> <li><a href ng-click="changeItemOwningLib()">[% l('Items to Previously Marked Library') %]</a></li> - <li><a href ng-click="transferItems()">[% l('Items to Previously Marked Volume') %]</a></li> + <li><a href ng-click="transferItems()">[% l('Items to Previously Marked Call Number') %]</a></li> </ul> </div> <div> diff --git a/Open-ILS/src/templates/staff/cat/share/t_embedded_volcopy.tt2 b/Open-ILS/src/templates/staff/cat/share/t_embedded_volcopy.tt2 index 4c704d7f99..8e2377967e 100644 --- a/Open-ILS/src/templates/staff/cat/share/t_embedded_volcopy.tt2 +++ b/Open-ILS/src/templates/staff/cat/share/t_embedded_volcopy.tt2 @@ -2,7 +2,7 @@ <div class="modal-header"> <button type="button" class="close" ng-click="cancel()" aria-hidden="true">×</button> - <h4 class="modal-title">[% l('Edit volumes') %]</h4> + <h4 class="modal-title">[% l('Edit call numbers') %]</h4> </div> <div class="modal-body"> <eg-embed-frame save-space="500" url="volcopy_url"></eg-embed-frame> diff --git a/Open-ILS/src/templates/staff/cat/share/t_volume_list.tt2 b/Open-ILS/src/templates/staff/cat/share/t_volume_list.tt2 index 6cb5692bb8..041204c9f3 100644 --- a/Open-ILS/src/templates/staff/cat/share/t_volume_list.tt2 +++ b/Open-ILS/src/templates/staff/cat/share/t_volume_list.tt2 @@ -5,8 +5,8 @@ grid-controls="holdingsGridControls" persist-key="cat.record_overlay.holdings"> - <eg-grid-menu-item handler="edit_volumes" label="[% l('Edit volumes') %]" ng-if="editVolumes"></eg-grid-menu-item> - <eg-grid-menu-item handler="edit_copies" label="[% l('Edit volumes and items') %]" ng-if="editCopies"></eg-grid-menu-item> + <eg-grid-menu-item handler="edit_volumes" label="[% l('Edit call numbers') %]" ng-if="editVolumes"></eg-grid-menu-item> + <eg-grid-menu-item handler="edit_copies" label="[% l('Edit call numbers and items') %]" ng-if="editCopies"></eg-grid-menu-item> <eg-grid-field label="[% l('Owning Library') %]" path="owner_label" flex="4" align="right" visible></eg-grid-field> <eg-grid-field label="[% l('Call Number') %]" path="call_number.label" visible></eg-grid-field> diff --git a/Open-ILS/src/templates/staff/cat/volcopy/index.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/index.tt2 index dc370dc774..385c904226 100644 --- a/Open-ILS/src/templates/staff/cat/volcopy/index.tt2 +++ b/Open-ILS/src/templates/staff/cat/volcopy/index.tt2 @@ -1,6 +1,6 @@ [% WRAPPER "staff/base.tt2"; - ctx.page_title = l("Volume/Item Editor"); + ctx.page_title = l("Holdings Editor"); ctx.page_app = "egVolCopy"; %] @@ -13,8 +13,8 @@ <script src="[% ctx.media_prefix %]/js/ui/default/staff/cat/services/record.js"></script> <script> angular.module('egCoreMod').run(['egStrings', function(s) { - s.VOL_COPY_TEMPLATE_SUCCESS_SAVE = "[% l('Saved volume/copy template(s)') %]"; - s.VOL_COPY_TEMPLATE_SUCCESS_DELETE = "[% l('Deleted volume/copy template') %]"; + s.VOL_COPY_TEMPLATE_SUCCESS_SAVE = "[% l('Saved holdings template(s)') %]"; + s.VOL_COPY_TEMPLATE_SUCCESS_DELETE = "[% l('Deleted holdings template') %]"; [%# Note the "~" characters escape the gettext brackets %] s.COPY_NOTE_INITIALS = "[% l('[_1] ~[ [_2] @ [_3] ~]', '{{value}}', '{{initials}}', '{{ws_ou}}') %]" diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2 index eef5c34b02..ffbaebaba7 100644 --- a/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2 +++ b/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2 @@ -48,7 +48,7 @@ <div class="row pad-vert" ng-if="template_controls && defaults.show_vol_template_controls"> <div class="row"> <div class="col-xs-12"> - <h4 class="center-block">[% l('Volume Attributes') %]</h4> + <h4 class="center-block">[% l('Call Number Attributes') %]</h4> </div> </div> </div> diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2 index 928174ea92..e4b79c517d 100644 --- a/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2 +++ b/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2 @@ -3,14 +3,14 @@ <div class="col-md-3"> <div class="row"> <div class="col-xs-12"> - <h4>[% l('Volume/Item Detail defaults') %]</h4> + <h4>[% l('Holdings Detail defaults') %]</h4> </div> </div> <div class="row"> <div class="col-xs-12"> <label> <input type="checkbox" ng-change="saveDefaults()" ng-model="defaults.always_volumes"/> - [% l('Always display Volume/Item Detail pane') %] + [% l('Always display Holdings Detail pane') %] </label> </div> </div> diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2 index 27a0aed04c..c3fb82b32b 100644 --- a/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2 +++ b/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2 @@ -4,8 +4,8 @@ <script>window.empty_label_string = "[% l('Missing Call Number') %]";</script> <div ng-show="!only_vols" class="btn-group"> <label class="btn btn-default" ng-click="show_vols = !show_vols"> - <span ng-show="show_vols" style="padding-right: 5px;">[% l('Hide Volume/Item Details') %]</span> - <span ng-hide="show_vols" style="padding-right: 5px;">[% l('Show Volume/Item Details') %]</span> + <span ng-show="show_vols" style="padding-right: 5px;">[% l('Hide Holdings Details') %]</span> + <span ng-hide="show_vols" style="padding-right: 5px;">[% l('Show Holdings Details') %]</span> </label> <label class="btn btn-default" ng-click="show_copies = !show_copies"> <span ng-show="show_copies" style="padding-right: 5px;">[% l('Hide Item Attributes') %]</span> @@ -39,12 +39,12 @@ </div> <div class="row pad-vert"> <div class="col-xs-1"><b>[% l('Owning Library') %]</b></div> - <div class="col-xs-1"><b>[% l('Volumes') %]</b></div> + <div class="col-xs-1"><b>[% l('Call Numbers') %]</b></div> <div class="col-xs-10"> <div class="row"> <div class="col-xs-2"><b>[% l('Classification') %]</b></div> <div class="col-xs-1"><b>[% l('Prefix') %]</b></div> - <div class="col-xs-2"><b>[% l('Call Number') %]</b></div> + <div class="col-xs-2"><b>[% l('Call Number Label') %]</b></div> <div class="col-xs-1"><b>[% l('Suffix') %]</b></div> <div class="col-xs-1" ng-hide="only_vols"><b>[% l('Items') %]</b></div> <div class="col-xs-5" ng-hide="only_vols"> @@ -76,7 +76,7 @@ <hr/> <div> <eg-org-selector alldisabled="{{record_id == 0}}" selected="new_lib_to_add" onchange="changeNewLib" disable-test="cant_have_vols"></eg-org-selector> - <button class="btn btn-default" ng-click="addLibToStruct()" type="button">[% l('Add volume') %]</button> + <button class="btn btn-default" ng-click="addLibToStruct()" type="button">[% l('Add call number') %]</button> </div> </div> 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 0226696a5b..c009569421 100644 --- a/Open-ILS/src/templates/staff/cat/volcopy/t_view.tt2 +++ b/Open-ILS/src/templates/staff/cat/volcopy/t_view.tt2 @@ -42,7 +42,7 @@ eg-navbar { <div ng-if="edit_templates"> <div class="row"> - <h2>[% l("Edit Volume/Item Templates") %]</h2> + <h2>[% l("Edit Holdings Templates") %]</h2> </div> <div class="row"> <eg-vol-template edit-templates="edit_templates"></eg-vol-template> 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 716e408b65..eff1448663 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 @@ -50,7 +50,7 @@ <!-- Edit Group --> <eg-grid-action handler="selectedHoldingsVolCopyEdit" group="[% l('Edit') %]" - label="[% l('Volumes and Items') %]"> + label="[% l('Holdings') %]"> </eg-grid-action> <eg-grid-action handler="printSpineLabels" group="[% l('Print') %]" 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 54e6362224..4bd3762cab 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 @@ -53,7 +53,7 @@ <eg-grid-action handler="grid_actions.cancel_hold" label="[% l('Cancel Hold') %]"></eg-grid-action> - <!-- Define the column using the sort-able copy location order + <!-- Define the column using the sort-able shelving location order position, but display the location label in each cell --> <eg-grid-field name="copy_location_order_position" required path="current_copy.location.name" label="[% l('Shelving Location') %]"> diff --git a/Open-ILS/src/templates/staff/circ/share/t_hold_details.tt2 b/Open-ILS/src/templates/staff/circ/share/t_hold_details.tt2 index 56e67f55b5..ab2b75291b 100644 --- a/Open-ILS/src/templates/staff/circ/share/t_hold_details.tt2 +++ b/Open-ILS/src/templates/staff/circ/share/t_hold_details.tt2 @@ -31,7 +31,7 @@ <div class="flex-row"> <div class="flex-cell">[% l('Current Shelf Lib') %]</div> <div class="flex-cell well">{{hold.current_shelf_lib().shortname()}}</div> - <div class="flex-cell">[% l('Current Copy Location') %]</div> + <div class="flex-cell">[% l('Current Shelving Location') %]</div> <div class="flex-cell well">{{hold.current_copy().location().name()}}</div> <div class="flex-cell">[% l('Force Item Quality') %]</div> <div class="flex-cell well">{{hold.mint_condition() == 't'}}</div> 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..425cd2f833 100644 --- a/Open-ILS/src/templates/staff/circ/transits/t_list.tt2 +++ b/Open-ILS/src/templates/staff/circ/transits/t_list.tt2 @@ -51,7 +51,7 @@ <a target="_self" href="./cat/item/{{item['target_copy.id']}}">{{item['target_copy.barcode']}}</a> </eg-grid-field> <eg-grid-field path='target_copy.circ_lib.shortname' hidden></eg-grid-field> - <eg-grid-field path='target_copy.location.name' label="[% l('Copy Location') %]" hidden sortable></eg-grid-field> + <eg-grid-field path='target_copy.location.name' label="[% l('Shelving Location') %]" hidden sortable></eg-grid-field> <eg-grid-field label="[% l('CN Prefix') %]" path="target_copy.call_number.prefix.label"></eg-grid-field> <eg-grid-field path='target_copy.call_number.label' hidden sortable></eg-grid-field> <eg-grid-field label="[% l('CN Suffix') %]" path="target_copy.call_number.suffix.label"></eg-grid-field> diff --git a/Open-ILS/src/templates/staff/css/cat.css.tt2 b/Open-ILS/src/templates/staff/css/cat.css.tt2 index 0b8f4ed099..9af6bd73b8 100644 --- a/Open-ILS/src/templates/staff/css/cat.css.tt2 +++ b/Open-ILS/src/templates/staff/css/cat.css.tt2 @@ -190,7 +190,7 @@ grid[name="-none-"] * label { color: black; } } /* - * Volume / Item Editor Styles + * Holdings Editor Styles * / /* Wrapping in bootstrap style can separate radio buttons from their labels. */ diff --git a/Open-ILS/src/templates/staff/serials/t_batch_receive.tt2 b/Open-ILS/src/templates/staff/serials/t_batch_receive.tt2 index cec2820355..00eddac116 100644 --- a/Open-ILS/src/templates/staff/serials/t_batch_receive.tt2 +++ b/Open-ILS/src/templates/staff/serials/t_batch_receive.tt2 @@ -45,7 +45,7 @@ <b>[% l('Issuance') %]</b> </div> <div class="col-md-1"> - <b>[% l('Copy location') %]</b> + <b>[% l('Shelving location') %]</b> </div> <div class="col-md-1"> <b>[% l('Call number') %]</b> diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd index 098d0752fc..ef72fec206 100644 --- a/Open-ILS/web/opac/locale/en-US/lang.dtd +++ b/Open-ILS/web/opac/locale/en-US/lang.dtd @@ -2179,8 +2179,8 @@ <!ENTITY staff.server.admin.closed_dates.date_span.invalid "Ending date is earlier than starting date"> <!ENTITY staff.server.admin.closed_dates.success "Closed date successfully updated"> <!ENTITY staff.server.admin.copy_locations.title "Evergreen: Copy Locations Editor"> -<!ENTITY staff.server.admin.copy_locations.editor " Copy Locations Editor "> -<!ENTITY staff.server.admin.copy_locations.editor.create "Create a new copy location"> +<!ENTITY staff.server.admin.copy_locations.editor " Shelving Locations Editor "> +<!ENTITY staff.server.admin.copy_locations.editor.create "Create a new shelving location"> <!ENTITY staff.server.admin.copy_locations.editor.name "Name: "> <!ENTITY staff.server.admin.copy_locations.editor.holdable.label "Holdable: "> <!ENTITY staff.server.admin.copy_locations.editor.hold_verify.label "Hold Verify: "> -- 2.11.0