From d680a873fada2f2bba326e8a1c92e5264252fe8c Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 24 Feb 2023 12:44:31 +0000 Subject: [PATCH] Bug 33005: (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 Signed-off-by: Andrew Auld --- .../prog/en/modules/acqui/newordersuggestion.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 8 +++++--- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 7 ++++--- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/acqui/z3950_search.tt | 4 ++-- 9 files changed, 19 insertions(+), 16 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt index 6dfaadc510..817e0eddd2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt @@ -26,7 +26,7 @@ Basket [% basketno | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Add order from a suggestion + Add order from a suggestion [% END %] [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt index ade84344d5..891002ad20 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt @@ -21,7 +21,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Ordered - [% fund_code | html %] + Ordered - [% fund_code | html %] [% END %] [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt index 80136acb7b..05dd691520 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -26,9 +26,11 @@ [% name | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Receive items from : [% name | html %] [% IF ( invoice ) %] - [[% invoice | html %]] - [% END %] (order #[% order.ordernumber | html %]) + [% IF ( invoice ) %] + Receive items from: [% name | html %] [[% invoice | html %]] (order #[% order.ordernumber | html %]) + [% ELSE %] + Receive items from: [% name | html %] (order #[% order.ordernumber | html %]) + [% END %] [% END %] [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] 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 268c309a04..5ec656850f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -29,9 +29,10 @@ [% END %] [% IF invoiceclosedate %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Receipt summary for [% name | html %] [% IF ( invoice ) %] - [ [% invoice | html %] ] + Receipt summary for [% name | html %] [ [% invoice | html %] ] + [% ELSE %] + Receipt summary for [% name | html %] [% END %] [% END %] [% ELSE %] @@ -39,7 +40,7 @@ [% name | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Receive orders from [% name | html %] + Receive orders from [% name | html %] [% END %] [% END %] [% END #/ WRAPPER breadcrumbs %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt index f0a6e0356b..1139e4ad99 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt @@ -21,7 +21,7 @@ [% name | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Receive shipment from vendor [% name | html %] + Receive shipment from vendor [% name | html %] [% END %] [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt index 9c64849bc6..158e0077e0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt @@ -21,7 +21,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Spent - [% fund_code | html %] + Spent - [% fund_code | html %] [% END %] [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt index 6b98eb307b..ad1229b290 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -110,11 +110,11 @@ [% name | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Update: [% name | html %] + Update: [% name | html %] [% END %] [% ELSE %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Add vendor + Add vendor [% END %] [% END %] [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt index fc8ce39773..e840846a76 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt @@ -23,11 +23,11 @@ [% booksellername | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Uncertain prices for vendor [% booksellername | html %] + Uncertain prices for vendor [% booksellername | html %] [% END %] [% ELSE %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Uncertain prices + Uncertain prices [% END %] [% END %] [% END #/ WRAPPER breadcrumbs %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt index 94e068518e..e79843fbc1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt @@ -57,14 +57,14 @@ tr.selected td { [% END %] [% IF ( opsearch ) %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Order from external source + Order from external source [% END %] [% ELSE %] [% WRAPPER breadcrumb_item %] Order from external source [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Search results + Search results [% END %] [% END # /IF opsearch %] [% END #/ WRAPPER breadcrumbs %] -- 2.30.2