From 85d2d5f520c208d4096c63c2f7fda337040b9660 Mon Sep 17 00:00:00 2001 From: David Nind Date: Thu, 23 Apr 2026 10:10:13 +0000 Subject: [PATCH] Bug 42454: Terminology: Use "and" instead of "&" for curbside pickups tab The "Staged & ready (0)" tab for curbside pickups (Circulation > Holds and bookings > Curbside pickup) should use "and" instead of "&". See terminology guidelines for "& (ampersand)" - Only use "&" when part of a proper noun or a common abbreviation,... Otherwise, use "and": https://wiki.koha-community.org/wiki/Terminology#characters Test plan: 1. Enable the CurbsidePickup system preference. 2. Configure curbside pickup for Centerville: - Go to Administration > Patrons and circulation > Curbside pickup - Set values: . Enable: selected . Pickup interval: 5 . Maximum patrons per interval: 1 . Patron-scheduled pickup: selected . Enable for waiting holds only: selected . Curbside pickup hours: add from and to hours for some days . Click Save configuration 3. Go to Circulation > Holds and bookings > Curbside pickup. 4. Note that there is an '&' in the "Staged & ready (0)" tab title. 5. Apply the patch. 6. Refresh the page. 7. Note that and is spelt in full "Stage and ready (0)". Signed-off-by: David Nind Signed-off-by: Alex Carver [Acerock7] Signed-off-by: Lucas Gass (cherry picked from commit f545db2179dd80afd4c2ad5fb498b8e999b8c32c) Signed-off-by: Baptiste Wojtkowski --- .../intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt index 7360ff4538..765cc44fe6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt @@ -167,7 +167,7 @@ To be staged ([% to_be_staged.count | html %]) [% END %] [% WRAPPER tab_item tabname= "staged-and-ready" bt_active = staged_and_ready_active %] - Staged & ready ([% staged_and_ready.count | html %]) + Staged and ready ([% staged_and_ready.count | html %]) [% END %] [% WRAPPER tab_item tabname= "patron-is-outside" bt_active = patron_is_outside_active %] Patron is outside ([% patron_outside.count | html %])