From d6088a18a0797291c1447f527029c66795082272 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 23 Feb 2023 22:29:16 +0000 Subject: [PATCH] Bug 33000: (follow-up) Add spans for translatability This patch finds places in the updated breadcrumbs markup where a translatable string is isolated in a way that makes it hard for the translation script to find it, and wraps these strings with This follow-up includes a change to admin/cities.tt as well. Signed-off-by: Lucas Gass --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/acqui/basketgroup.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/acqui/basketheader.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/acqui/booksellers.tt | 3 ++- .../intranet-tmpl/prog/en/modules/acqui/cancelorder.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt | 4 ++-- 12 files changed, 18 insertions(+), 17 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index a3b08063c6..6fa7008a90 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -18,7 +18,7 @@ [% WRAPPER 'sub-header.inc' %] [% WRAPPER breadcrumbs %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Acquisitions + Acquisitions [% END %] [% END #/ WRAPPER breadcrumbs %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index c1a4ce080a..87add6951c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -43,7 +43,7 @@ Basket [% basketno | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Add orders from MARC file + Add orders from MARC file [% END %] [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index f5a62063d6..e7d4cbfaa0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -51,11 +51,11 @@ New [% END %] [% END %] - Basket [% basketname | html %] [% IF ( basketno ) %] - ([% basketno | html %]) + Basket [% basketname | html %] ([% basketno | html %]) for [% booksellername | html %] + [% ELSE %] + Basket [% basketname | html %] for [% booksellername | html %] [% END %] - for [% booksellername | html %] [% END %] [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt index 7c9739063e..ce72d07c75 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -111,14 +111,14 @@ Basket grouping [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Add basket group for [% booksellername | html %] + Add basket group for [% booksellername | html %] [% END %] [% ELSE %] [% WRAPPER breadcrumb_item %] [% booksellername | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Basket grouping + Basket grouping [% END %] [% END # /IF grouping %] [% END #/ WRAPPER breadcrumbs %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt index 928c313c56..88dd4cb354 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt @@ -30,11 +30,11 @@ [% IF ( add_form ) %] [% IF ( basketno ) %] [% WRAPPER breadcrumb_item bc_active= 1%] - Edit basket '[% basketname | html %]' + Edit basket '[% basketname | html %]' [% END %] [% ELSE %] [% WRAPPER breadcrumb_item bc_active= 1%] - Add a basket to [% booksellername | html %] + Add a basket to [% booksellername | html %] [% END %] [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt index d3539629ef..1297f7b423 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -4,6 +4,7 @@ [% USE Asset %] [% USE AuthorisedValues %] [% USE KohaDates %] +[% USE HtmlTags %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Search for vendor [% supplier | html %] › Koha @@ -26,7 +27,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Search for vendor [% supplier | html %] + Search for vendor [% supplier | $HtmlTags tag='em' %] [% END %] [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt index e0138d0f10..65899cc0ac 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt @@ -19,7 +19,7 @@ Basket [% basket.basketname | html %] ([% basket.basketno | html %]) for [% basket.bookseller.name | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Cancel order + Cancel order [% END %] [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt index e065d4c42a..9997b9b765 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt @@ -35,7 +35,7 @@ Acquisitions › Koha Basket [% basket.basketno | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Duplicate existing orders + Duplicate existing orders [% END %] [% END # /UNLESS blocking_error %] [% END #/ WRAPPER breadcrumbs %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt index 58cef5c881..6423e20968 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt @@ -15,7 +15,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Basket ([% basketno | html %]) + Basket ([% basketno | html %]) [% END %] [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt index 5276981a1f..6b6f8900d1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt @@ -21,7 +21,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - EDIFACT messages + EDIFACT messages [% END %] [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt index b139930adc..05c7a165f5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt @@ -14,7 +14,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - EDIFACT messages + EDIFACT messages [% END %] [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt index 98235c8215..d34ba5e63a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt @@ -46,12 +46,12 @@ Cities [% END %] [% WRAPPER breadcrumb_item bc_active = 1 %] - Confirm deletion of city + Confirm deletion of city [% END %] [% ELSE %] [% WRAPPER breadcrumb_item bc_active = 1 %] - Cities + Cities [% END %] [% END #/IF op = add_form %] -- 2.30.2