From 16af0a42e9f663bc0e9019465b5bf03db967a2ca Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Mon, 13 Apr 2020 04:32:56 +0200 Subject: [PATCH] Bug 22468: Standardize on labelling ccode table columns as Collections We now display the descriptions everywhere, so we should drop the 'code' from labels. This changes text in a lot of playes in Koha, including: - The relatives checkouts table when displayed for the guarantor - The new order and order receive forms in acquisitoins (item creation) - The description of CCODE in the authorised values table - The column description on results in item search - The branch tranfers page - Course reserves: add reserve items (one and in batch) - Patron account > statistics tab Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize Signed-off-by: Joy Nelson (cherry picked from commit 58990eda36c29d09903c2135e76529c6a3accfcc) Signed-off-by: Lucas Gass --- .../prog/en/includes/relatives-issues-table.inc | 2 +- .../intranet-tmpl/prog/en/modules/acqui/neworderempty.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 4 ++-- .../prog/en/modules/admin/authorised_values.tt | 2 +- .../intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/circ/branchtransfers.tt | 4 ++-- .../prog/en/modules/course_reserves/add_items-step2.tt | 2 +- .../prog/en/modules/course_reserves/batch_add_items.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/statistics.tt | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/relatives-issues-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/relatives-issues-table.inc index 28addf4815..b7a2f2a568 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/relatives-issues-table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/relatives-issues-table.inc @@ -8,7 +8,7 @@ Due date Title Item type - Collection code + Collection Location Checked out on (hidden, unformatted) Checked out on diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index 0f6cab732b..ca54243492 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -268,7 +268,7 @@ Call number Copy number Inventory number - Collection code + Collection Item type Materials Notes diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt index bf940446cf..16d81361dc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -126,7 +126,7 @@ Call number Copy number Inventory number - Collection code + Collection Item type Materials Notes @@ -169,7 +169,7 @@ Call number Copy number Inventory number - Collection code + Collection Item type Materials Notes diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt index 272aeba307..84a1cf8b83 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt @@ -346,7 +346,7 @@ [% CASE 'CAND' %]

[% CASE 'CCODE' %] -

Collection codes (appears when cataloging and working with items)

+

Collections (appear when cataloging and working with items)

[% CASE 'cn_source' %]

[% CASE 'CONTROL_NUM_SEQUENCE' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt index 7adecfe6ac..6f4f7bcaa9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt @@ -11,7 +11,7 @@ [% CASE 'author' %]Author [% CASE 'publishercode' %]Publisher [% CASE 'publicationyear' %]Publication date - [% CASE 'collectiontitle' %]Collection + [% CASE 'collectiontitle' %]Collection title [% CASE 'isbn' %]ISBN [% CASE 'issn' %]ISSN [% CASE 'homebranch' %]Home library @@ -21,8 +21,8 @@ [% CASE 'All locations' %]All locations [% CASE 'itype' %]Item type [% CASE 'All item types' %]All item types - [% CASE 'ccode' %]Collection code - [% CASE 'All collection codes' %]All collection codes + [% CASE 'ccode' %]Collection + [% CASE 'All collection codes' %]All collections [% CASE 'notforloan' %]Status [% CASE 'All statuses' %]All statuses [% CASE 'damaged' %]Damaged diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt index 4859333a3b..3e7f9e936f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt @@ -125,7 +125,7 @@ [% IF ( Koha.Preference('BranchTransferLimitsType') == 'itemtype' ) %]
  • Item type: [% ItemTypes.GetDescription( errmsgloo.code ) | html %]
    • [% ELSE %] -
  • Collection code: [% AuthorisedValues.GetByCode( 'CCODE', errmsgloo.code ) | html %]
    • +
  • Collection: [% AuthorisedValues.GetByCode( 'CCODE', errmsgloo.code ) | html %]
    • [% END %]
  • Destination library: [% Branches.GetName( errmsgloo.tbr ) | html %]
    • @@ -180,7 +180,7 @@ Shelving location Call number Item type - Collection code + Collection Destination [% FOREACH trsfitemloo IN trsfitemloop %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt index 919c7d57c6..061821d708 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt @@ -54,7 +54,7 @@ [% END %]
  • - + [% FOREACH c IN AuthorisedValues.Get('CCODE') %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt index f79f36c85c..248714b01c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt @@ -41,7 +41,7 @@ [% CASE 'itype' %] Item type [% CASE 'ccode' %] - Collection code + Collection [% CASE 'location' %] Shelving location [% CASE 'homebranch' %] -- 2.39.5