From e68ecb3311eb34e8b1f12a98ccf51576c03f3307 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 17 May 2022 12:04:41 +0000
Subject: [PATCH] Bug 30772: Terminology: Replace instances of "reserve" with
 "hold"

There were several templates where we were still using the term
"reserve" instead of "hold." This patch corrects the ones I found,
including in a couple of HTML comments.

To test, apply the patch and confirm that the changes look correct and
affect only the relevant term.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt   | 2 +-
 .../intranet-tmpl/prog/en/modules/circ/branchtransfers.tt | 8 ++++----
 .../prog/en/modules/circ/circulation_batch_checkouts.tt   | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt   | 2 +-
 .../intranet-tmpl/prog/en/modules/reserve/request.tt      | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt  | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
index bbc9b3dc63..d34b5e70b2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -279,7 +279,7 @@
                         [%# FIXME Here we block the cancellation if holds exist. Actually it could be possible if items will be exist after the deletion %]
                         [%# Some additional checks should be added in the pl file %]
                         [% span_title = BLOCK %]
-                          <span>Cannot cancel receipt of this order line because at least one reservation exists on the records.</span>
+                          <span>Cannot cancel receipt of this order line because at least one hold exists on the records.</span>
                         [% END %]
                       [% END %]
                       <span title="[% span_title | collapse | html %]">
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 1e175bd329..267cb064e2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
@@ -42,7 +42,7 @@
     <table>
         <caption>
             [% IF ( reserved ) %]
-                Reserve found for [% INCLUDE 'patron-title.inc' patron => hold.patron | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
+                Hold found for [% INCLUDE 'patron-title.inc' patron => hold.patron | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
             [% END %]
             [% IF ( waiting ) %]
                 Item is marked waiting at [% branchname | html %] for [% name | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
@@ -54,9 +54,9 @@
         <tr>
             <th>
                 [% IF ( reserved ) %]
-                        Set reserve to transit and transfer book to [% Branches.GetName( hold.branchcode ) | html %]:
+                        Transfer item to [% Branches.GetName( hold.branchcode ) | html %]:
                 [% END %]
-                [% IF ( waiting or transferred ) %]Cancel reservation and then attempt transfer: [% END %]
+                [% IF ( waiting or transferred ) %]Cancel hold and then attempt transfer: [% END %]
             </th>
             <td>
                 <form method="post" name="mainform" id="mainform" action="branchtransfers.pl">
@@ -83,7 +83,7 @@
         </tr>
             [% IF ( reserved ) %]
                 <tr>
-                    <th>Cancel reservation and then attempt transfer:</th>
+                    <th>Cancel hold and then attempt transfer:</th>
                     <td>
                         <form method="post" name="mainform" id="mainform" action="branchtransfers.pl">
                             [% FOREACH trsfitemloo IN trsfitemloop %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
index 550850c241..ef837f5b2f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
@@ -216,7 +216,7 @@
                       </script>
                   [% END %]
 
-                  [% IF NOT checkout_info.IMPOSSIBLE && ( CAN_user_circulate_force_checkout || checkout_info.HIGHHOLDS ) && ( checkout_info.RESERVED || checkout_info.RESERVE_WAITING || checkout_info.TRANSFERRED || checkout_info.PROCESSING ) %] <!-- arbitrary choice, revert the reserve is not possible-->
+                  [% IF NOT checkout_info.IMPOSSIBLE && ( CAN_user_circulate_force_checkout || checkout_info.HIGHHOLDS ) && ( checkout_info.RESERVED || checkout_info.RESERVE_WAITING || checkout_info.TRANSFERRED || checkout_info.PROCESSING ) %] <!-- arbitrary choice, revert the hold is not possible-->
                       <li><i class="fa fa-li fa-warning"></i>This item is on hold for another patron. The hold will be overridden, but not cancelled.</li>
                   [% ELSIF checkout_info.RESERVED %]
                       <li><i class="fa fa-li fa-warning"></i>This item is on hold for another patron.</li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index afba66427f..ab184328ea 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -624,7 +624,7 @@
                                 </div> <!-- /#item-transfer-modal -->
                             [% END # /IF transfer || needstransfer %]
 
-                            <!-- case of simple return no issue or transfer but with a reservation  -->
+                            <!-- case of simple return no issue or transfer but with a hold  -->
                             [% IF ( reserved and !recalled and !waitingrecall ) %]
                                 <!-- reserved -->
                                 <div id="hold-found2" class="modal fade audio-alert-action block">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index 96faff5868..9cb4487815 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -664,7 +664,7 @@
                                                                 [% ELSIF itemloo.not_holdable == 'pickupNotInHoldGroup' %]
                                                                     <span>Only pickup locations within the same hold group are allowed</span>
                                                                 [% ELSIF itemloo.not_holdable == 'noReservesAllowed' %]
-                                                                    <span>No reserves are allowed on this item</span>
+                                                                    <span>No holds are allowed on this item</span>
                                                                 [% ELSIF itemloo.not_holdable == 'libraryNotPickupLocation' %]
                                                                     <span>Library is not a pickup location</span>
                                                                 [% ELSIF itemloo.not_holdable == 'no_valid_pickup_location' %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
index 6637cfab6f..9ba289bc16 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
@@ -197,7 +197,7 @@
 
                                 [% UNLESS ( bibitemloo.holdable ) %]
                                     [% IF ( bibitemloo.ageRestricted ) %]
-                                        <div class="alert alert-warning">Sorry, you are too young to reserve this material.</div>
+                                        <div class="alert alert-warning">Sorry, you are too young to hold this material.</div>
                                     [% END %]
                                     [% IF ( bibitemloo.already_reserved ) %]
                                         <div class="alert alert-warning">You have already requested this title.</div>
-- 
2.39.5