From fa797e119f78fff5695f97bc4d992e14b2e9bc3a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 6 Jun 2023 15:29:12 +0000 Subject: [PATCH] Bug 33925: Improve translation of title tags: Serials This patch updates serials templates so that title tags can be more easily translated. Some templates have been updated for consistency as well: Harmonizing page title, breaddrumb navigation, and page headers; Adding "page-section"
where it was lacking. To test, apply the patch and confirm that the following pages have the correct title tags: - Serials home - Serials search results - Subscription details - Subscription edit - Search for vendor - Search for bibliographic record - Subscription renew - Serial collection - Create and modify routing list - Preview routing list - View routing slip - Claims - Check expiration - With a subscription which has manual history enabled, click the "Edit history" link under the "Planning" tab. - Select multiple serial search results and batch edit - New subscription - Manage frequencies: Create and edit - Manage numbering patterns: Create and edit --- .../en/modules/serials/acqui-search-result.tt | 10 +- .../prog/en/modules/serials/acqui-search.tt | 8 +- .../en/modules/serials/checkexpiration.tt | 136 +++++++++--------- .../prog/en/modules/serials/claims.tt | 10 +- .../prog/en/modules/serials/result.tt | 8 +- .../modules/serials/routing-preview-slip.tt | 10 +- .../en/modules/serials/routing-preview.tt | 8 +- .../prog/en/modules/serials/routing.tt | 21 ++- .../en/modules/serials/serials-collection.tt | 8 +- .../prog/en/modules/serials/serials-edit.tt | 15 +- .../prog/en/modules/serials/serials-home.tt | 6 +- .../prog/en/modules/serials/serials-search.tt | 7 +- .../en/modules/serials/subscription-add.tt | 12 +- .../modules/serials/subscription-batchedit.tt | 7 +- .../serials/subscription-bib-search.tt | 8 +- .../en/modules/serials/subscription-detail.tt | 11 +- .../serials/subscription-frequencies.tt | 35 ++++- .../modules/serials/subscription-history.tt | 80 ++++++----- .../serials/subscription-numberpatterns.tt | 16 ++- .../en/modules/serials/subscription-renew.tt | 17 ++- .../prog/en/modules/serials/viewalerts.tt | 8 +- 21 files changed, 304 insertions(+), 137 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt index ab5e55f5ab..6bbbe6c1f5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt @@ -1,6 +1,12 @@ +[% USE raw %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Select vendor › Serials › Koha +[% FILTER collapse %] + [% t("Vendor search results") | html %] › + [% t("Serials") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -18,6 +24,7 @@ [% END %] [% IF ( loop_suppliers ) %] +
@@ -30,6 +37,7 @@ [% END %]
Vendor
+
[% END %]

Perform a new search

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tt index 37ae608d42..8baf98a0e0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tt @@ -1,5 +1,11 @@ +[% USE raw %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Search for vendor › Serials › Koha +[% FILTER collapse %] + [% t("Search for vendor") | html %] › + [% t("Serials") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt index f2eaebafef..a6fc39099f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt @@ -1,9 +1,14 @@ [% USE raw %] [% USE Branches %] [% USE KohaDates %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Check expiration › Serials › Koha +[% FILTER collapse %] + [% t("Check expiration") | html %] › + [% t("Serials") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -70,73 +75,68 @@ [% IF ( subscriptions_loop ) %] -

- [% numsubscription | html %] subscription(s) - [% IF ( title ) %] - with title matching [% title | html %] - [% IF ( issn ) %]and [% END %] - [% END %] - [% IF ( issn ) %] - with ISSN matching [% issn | html %] - [% END %] - will expire before [% date | $KohaDates %] -

- - - - - - - - - - [% IF can_change_library %][% END %] - - - - - - [% FOREACH subscriptions_loo IN subscriptions_loop %] - - - - - [% IF can_change_library %][% END %] - - - - - - [% END %] -
ISSNTitleLibraryOPAC noteNonpublic noteExpiration dateActions
- - - [% subscriptions_loo.issn | html %] - [% IF ( subscriptions_loo.title ) %] - [% subscriptions_loo.title | html %] - [% ELSE %] - | - [% END %] - - - [% Branches.GetName( subscriptions_loo.branchcode ) | html %] - - [% subscriptions_loo.notes | html %] - - [% subscriptions_loo.internalnotes | html %] - - [% subscriptions_loo.expirationdate | $KohaDates %] - - Edit - Renew -
+

+ [% expirydate = date | $KohaDates %] + [% tnx("Your search returned 1 subscription expiring before {date}", "Your search returned {count} subscriptions expiring before {date}", numsubscription, { date = expirydate, count = numsubscription }) %] +

+ +
+ + + + + + + + + [% IF can_change_library %][% END %] + + + + + + [% FOREACH subscriptions_loo IN subscriptions_loop %] + + + + + [% IF can_change_library %][% END %] + + + + + + [% END %] +
ISSNTitleLibraryOPAC noteNonpublic noteExpiration dateActions
+ + + [% subscriptions_loo.issn | html %] + [% IF ( subscriptions_loo.title ) %] + [% subscriptions_loo.title | html %] + [% ELSE %] + | + [% END %] + + + [% Branches.GetName( subscriptions_loo.branchcode ) | html %] + + [% subscriptions_loo.notes | html %] + + [% subscriptions_loo.internalnotes | html %] + + [% subscriptions_loo.expirationdate | $KohaDates %] + + Edit + Renew +
+
[% ELSIF searched %]

No results for your query

[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt index 613650f5ab..b3aea40790 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt @@ -3,9 +3,17 @@ [% USE AuthorisedValues %] [% USE Branches %] [% USE KohaDates %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] - [% IF ( supplierid ) -%] Claims for [% suppliername | html %] › [% END %] Claims › Serials › Koha + [% FILTER collapse %] + [% IF( supplierid ) %] + [% tx("Claims for {vendor}", { vendor = suppliername }) | html %] › + [% END %] + [% t("Claims") | html %] › + [% t("Serials") | html %] › + [% t("Koha") | html %] + [% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt index d46bd08f3a..9c50bcd951 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt @@ -1,6 +1,12 @@ +[% USE raw %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Search results › Serials › Koha +[% FILTER collapse %] + [% t("Search results") | html %] › + [% t("Serials") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt index 2d229d0180..f6afe9e9e2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt @@ -1,8 +1,13 @@ -[% USE Koha %] [% USE raw %] +[% USE Koha %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Routing slip preview › Serials › Koha +[% FILTER collapse %] + [% tx("Routing slip for {title}", { title = title }) | html %] › + [% t("Serials") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt index 19d53a1c33..59774f59b0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt @@ -4,9 +4,19 @@ [% USE KohaDates %] [% USE Branches %] [% USE Koha %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -[% IF ( modify ) %][% bibliotitle | html %] › Modify subscription[% ELSE %]New subscription[% END %] › Serials › Koha +[% FILTER collapse %] + [% IF( modify ) %] + [% t("Modify subscription") | html %] › + [% bibliotitle | html %] + [% ELSE %] + [% t("New subscription") | html %] + [% END %] › + [% t("Serials") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %]