From e68ecb3311eb34e8b1f12a98ccf51576c03f3307 Mon Sep 17 00:00:00 2001 From: Owen Leonard 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 Signed-off-by: Victor Grousset/tuxayo Signed-off-by: Tomas Cohen Arazi --- 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 %] - Cannot cancel receipt of this order line because at least one reservation exists on the records. + Cannot cancel receipt of this order line because at least one hold exists on the records. [% END %] [% END %] 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 @@ [% IF ( reserved ) %] - +
[% IF ( reserved ) %] - Reserve found for [% INCLUDE 'patron-title.inc' patron => hold.patron | html %] ([% borrowernumber | html %]). + Hold found for [% INCLUDE 'patron-title.inc' patron => hold.patron | html %] ([% borrowernumber | html %]). [% END %] [% IF ( waiting ) %] Item is marked waiting at [% branchname | html %] for [% name | html %] ([% borrowernumber | html %]). @@ -54,9 +54,9 @@
[% 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 %]
@@ -83,7 +83,7 @@
Cancel reservation and then attempt transfer:Cancel hold and then attempt transfer: [% 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 @@ [% 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 ) %] + [% 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 ) %]
  • This item is on hold for another patron. The hold will be overridden, but not cancelled.
  • [% ELSIF checkout_info.RESERVED %]
  • This item is on hold for another patron.
  • 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 @@ [% END # /IF transfer || needstransfer %] - + [% IF ( reserved and !recalled and !waitingrecall ) %]