Attachment 154800 Details for Bug 33913 – Bug 33913: (QA follow-up) Move variables into strings

[patch] Bug 33913: (QA follow-up) Move variables into strings

Bug-33913-QA-follow-up-Move-variables-into-strings.patch (text/plain), 4.89 KB, created by Owen Leonard on 2023-08-25 10:47:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2023-08-25 10:47:04 UTC

Size: 4.89 KB

patch

obsolete

>From abe741b7265c2a3b7b4fb1597fc98fafa4b5a10d Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <katrin.fischer.83@web.de>
>Date: Thu, 24 Aug 2023 20:55:37 +0000
>Subject: [PATCH] Bug 33913: (QA follow-up) Move variables into strings
>
>To test:
>
>1) Checking out to {patron}
>* Search for any patron
>* Click on cardnumber in patron search results
>* Verify that page title reads correctly and includes patron's name
>
>2) Batch check out to {patron}
>* Activate BatchCheckouts system preference
>* Check all patron categories for BatchCheckoutsValidCategories
>* Go to any patron account
>* Click on batch checkout tab
>* Verify that the page title reads correctly and includes patron's name
>
>3) Place a hold on {title}
>* Search for a record with items in the staff interface catalog
>* Click on 'place holds'
>* Verify that the page title reads correctly and includes the title of the record
>
>4) Overdues as of {date}
>* Set DateFormat system preference to any other than default
>* Go to circulation > overdues
>* Verify the page title includes today's date in the correct format
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt  | 3 ++-
> .../prog/en/modules/circ/circulation_batch_checkouts.tt      | 5 ++---
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt      | 3 ++-
> koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt   | 3 ++-
> 4 files changed, 8 insertions(+), 6 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>index f729953219..3388e387a5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -16,7 +16,8 @@
> [% SET destination = "circ" %]
> <title>[% FILTER collapse %]
>     [% IF patron %]
>-        [% t("Checking out to") | html %] [% INCLUDE 'patron-title.inc' invert_name = 1 no_html = 1 %] &rsaquo;
>+        [% patron_in_title = INCLUDE 'patron-title.inc' invert_name = 1 no_html = 1 %]
>+        [% tx("Checking out to {patron}", { patron = patron_in_title }) | html %]  &rsaquo;
>     [% END %]
>     [% t("Circulation") | html %] &rsaquo;
>     [% t("Koha") | html %]
>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 1cab3f89f1..f9f31a0212 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
>@@ -11,9 +11,9 @@
> [% SET destination = "circ" %]
> <title>[% FILTER collapse %]
>     [% IF patron %]
>-        [% t("Batch check out to") | html %] [% INCLUDE 'patron-title.inc' invert_name = 1 no_html = 1 %] &rsaquo;
>+        [% patron_in_title = INCLUDE 'patron-title.inc' invert_name = 1 no_html = 1 %]
>+        [% tx("Batch check out to {patron}", { patron = patron_in_title }) | html %] &rsaquo;
>     [% END %]
>-
>     [% t("Circulation") | html %] &rsaquo;
>     [% t("Koha") | html %]
> [% END %]</title>
>@@ -31,7 +31,6 @@
>         [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
>         [% END %]
>-
>         [% IF patron %]
>             [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber | uri %]">Check out to [% INCLUDE 'patron-title.inc' %]</a>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>index 4e87b70956..530e1d1e2d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>@@ -13,7 +13,8 @@
> [% INCLUDE 'doc-head-open.inc' %]
> [% PROCESS 'modal-claims.inc' %]
> <title>[% FILTER collapse %]
>-    [% t("Items overdue as of") | html %] [% todaysdate | $KohaDates %] &rsaquo;
>+    [% date_in_title = todaysdate | $KohaDates %]
>+    [% tx("Items overdue as of {date}", { date = date_in_title }) | html %] &rsaquo;
>     [% t("Circulation") | html %] &rsaquo;
>     [% t("Koha") | html %]
> [% END %]</title>
>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 c981e4e011..59f90bb2d8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>@@ -20,7 +20,8 @@
> [% PROCESS "patron-search.inc" %]
> <title>[% FILTER collapse %]
>     [% UNLESS ( multi_hold ) %]
>-        [% t("Place a hold on") | html %] [% INCLUDE 'biblio-title-head.inc' %] &rsaquo;
>+        [% title_in_title = INCLUDE 'biblio-title-head.inc' %]
>+        [% tx("Place a hold on {title}", { title = title_in_title }) | html %] &rsaquo;
>     [% ELSE %]
>         [% t("Confirm holds") | html %] &rsaquo;
>     [% END %]
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 33913: 152116 | 152117 | 152305 | 154670 | 154752 | 154753 | 154800