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 <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

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 97e9ba6..c13d045 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/relatives-issues-table.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/relatives-issues-table.inc
@@ -9,7 +9,7 @@
                     <th scope="col">Title</th>
                     <th scope="col">Record-level item type</th>
                     <th scope="col">Item type</th>
-                    <th scope="col">Collection code</th>
+                    <th scope="col">Collection</th>
                     <th scope="col">Location</th>
                     <th scope="col">Checked out on (hidden, unformatted)</th>
                     <th scope="col">Checked out on</th>

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 40a4aff..ed546f7 100644 (file)
--- 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 @@
                           <th>Call number</th>
                           <th>Copy number</th>
                           <th>Inventory number</th>
-                          <th>Collection code</th>
+                          <th>Collection</th>
                           <th>Item type</th>
                           <th>Materials</th>
                           <th>Notes</th>

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 049ff6f..c9161e4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -157,7 +157,7 @@
                             <th>Call number</th>
                             <th>Copy number</th>
                             <th>Inventory number</th>
-                            <th>Collection code</th>
+                            <th>Collection</th>
                             <th>Item type</th>
                             <th>Materials</th>
                             <th>Notes</th>
@@ -200,7 +200,7 @@
                             <th>Call number</th>
                             <th>Copy number</th>
                             <th>Inventory number</th>
-                            <th>Collection code</th>
+                            <th>Collection</th>
                             <th>Item type</th>
                             <th>Materials</th>
                             <th>Notes</th>

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 7f3acbe..16ab04b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
@@ -347,7 +347,7 @@
         [% CASE 'CAND' %]
             <p></p>
         [% CASE 'CCODE' %]
-            <p>Collection codes (appears when cataloging and working with items)</p>
+            <p>Collections (appear when cataloging and working with items)</p>
         [% CASE 'cn_source' %]
             <p></p>
         [% 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 b6e263b..b1fa37e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
@@ -12,7 +12,7 @@
     [% CASE 'author' %]<span>Author</span>
     [% CASE 'publishercode' %]<span>Publisher</span>
     [% CASE 'publicationyear' %]<span>Publication date</span>
-    [% CASE 'collectiontitle' %]<span>Collection</span>
+    [% CASE 'collectiontitle' %]<span>Collection title</span>
     [% CASE 'isbn' %]<span>ISBN</span>
     [% CASE 'issn' %]<span>ISSN</span>
     [% CASE 'homebranch' %]<span>Home library</span>
@@ -22,8 +22,8 @@
     [% CASE 'All locations' %]<span>All locations</span>
     [% CASE 'itype' %]<span>Item type</span>
     [% CASE 'All item types' %]<span>All item types</span>
-    [% CASE 'ccode' %]<span>Collection code</span>
-    [% CASE 'All collection codes' %]<span>All collection codes</span>
+    [% CASE 'ccode' %]<span>Collection</span>
+    [% CASE 'All collection codes' %]<span>All collections</span>
     [% CASE 'notforloan' %]<span>Status</span>
     [% CASE 'All statuses' %]<span>All statuses</span>
     [% CASE 'damaged' %]<span>Damaged</span>

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 4859333..3e7f9e9 100644 (file)
--- 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' ) %]
                                               <li>Item type: <b>[% ItemTypes.GetDescription( errmsgloo.code ) | html %]</b></li>
                                           [% ELSE %]
-                                              <li>Collection code: <b>[% AuthorisedValues.GetByCode( 'CCODE', errmsgloo.code ) | html %]</b></li>
+                                              <li>Collection: <b>[% AuthorisedValues.GetByCode( 'CCODE', errmsgloo.code ) | html %]</b></li>
                                           [% END %]
                                           <li>Destination library: <b>[% Branches.GetName( errmsgloo.tbr ) | html %]</b></li>
                                       </ol>
@@ -180,7 +180,7 @@
                 <th class="tf-location">Shelving location</th>
                 <th class="tf-itemcallnumber">Call number</th>
                 <th class="tf-itemtype">Item type</th>
-                <th class="tf-ccode">Collection code</th>
+                <th class="tf-ccode">Collection</th>
                 <th class="tf-destination">Destination</th>
             </tr>
             [% 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 919c7d5..061821d 100644 (file)
--- 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 %]
 
                     <li>
-                        <label class="required" for="ccode">Collection code:</label>
+                        <label class="required" for="ccode">Collection:</label>
                         <select id="ccode" name="ccode">
                             <option value="">LEAVE UNCHANGED</option>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt
index ce67aab..068c6ba 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt
@@ -46,7 +46,7 @@
                         [% END %]
 
                         <li>
-                            <label class="required" for="ccode">Collection code:</label>
+                            <label class="required" for="ccode">Collection:</label>
                             <select id="ccode" name="ccode">
                                 <option value="">LEAVE UNCHANGED</option>
                                 [% 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 f79f36c..248714b 100644 (file)
--- 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' %]