From 86a3e00eeca1b36eae56b635a0a423167a50a2d8 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 6 Jun 2023 15:13:18 +0000 Subject: [PATCH] Bug 33913: Improve translation of title tags: Circulation, holds, and ILL This patch updates circulation, holds, and ILL templates so that title tags can be more easily translated. To test, apply the patch and confirm that the following pages have the correct title tags: - Circulation -> Article requests - Catalog -> Bibliographic record -> Items -> View item's checkout history - Circulation -> Overdues with fines - Circulation -> Transfers - Circulation -> Checkout notes - Circulation -> Circulation home - Circulation -> Check out - Circulation -> Batch checkouts - Circulation -> Curbside pickups - Circulation -> On-site checkouts - Circulation -> Overdues - Circulation -> Holds to pull - Circulation -> Checkout to patron -> Print slip - Circulation -> Renew - Catalog -> Bibliographic record -> Request article - Circulation -> Hold ratios - Circulation -> Check in - Circulation -> Set library - Circulation -> Transfers to receive - Circulation -> Transfers to send - Circulation -> Holds queue - Circulation -> Holds awaiting pickup - ILL requests - Catalog -> Bibliographic record -> Holds https://bugs.koha-community.org/show_bug.cgi?id=33907 --- .../prog/en/modules/circ/article-requests.tt | 7 ++++++- .../prog/en/modules/circ/bookcount.tt | 6 +++++- .../prog/en/modules/circ/branchoverdues.tt | 6 +++++- .../prog/en/modules/circ/branchtransfers.tt | 7 ++++++- .../prog/en/modules/circ/checkout-notes.tt | 7 ++++++- .../prog/en/modules/circ/circulation-home.tt | 6 +++++- .../prog/en/modules/circ/circulation.tt | 11 ++++++----- .../circ/circulation_batch_checkouts.tt | 10 ++++++---- .../prog/en/modules/circ/curbside_pickups.tt | 7 ++++++- .../prog/en/modules/circ/offline.tt | 6 +++++- .../prog/en/modules/circ/on-site_checkouts.tt | 7 ++++++- .../prog/en/modules/circ/overdue.tt | 7 ++++++- .../prog/en/modules/circ/pendingreserves.tt | 7 ++++++- .../prog/en/modules/circ/printslip.tt | 19 ++++++++++++++----- .../prog/en/modules/circ/renew.tt | 7 ++++++- .../prog/en/modules/circ/request-article.tt | 7 ++++++- .../prog/en/modules/circ/reserveratios.tt | 7 ++++++- .../prog/en/modules/circ/returns.tt | 6 +++++- .../prog/en/modules/circ/set-library.tt | 15 ++++++++++----- .../prog/en/modules/circ/transfers_to_send.tt | 7 ++++++- .../en/modules/circ/transferstoreceive.tt | 7 ++++++- .../prog/en/modules/circ/view_holdsqueue.tt | 7 ++++++- .../prog/en/modules/circ/waitingreserves.tt | 6 +++++- .../prog/en/modules/ill/ill-requests.tt | 9 ++++++--- .../prog/en/modules/reserve/request.tt | 15 ++++++++++----- 25 files changed, 160 insertions(+), 46 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt index 88e0306baa..adb6e2aed4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt @@ -5,9 +5,14 @@ [% USE AuthorisedValues %] [% USE Asset %] [% USE raw %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Article requests › Circulation › Koha +[% FILTER collapse %] + [% t("Article requests") | html %] › + [% t("Circulation") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt index c3a4e7b5c8..187d32224a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt @@ -5,7 +5,11 @@ [% SET footerjs = 1 %] [% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Circulation statistics for [% title | html %] › Catalog › Koha +[% FILTER collapse %] + [% tx("Circulation statistics for {title}", { title = title }) | html %] › + [% t("Catalog") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt index bf203e0c28..63d3ea2382 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt @@ -3,7 +3,11 @@ [% USE Koha %] [% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Overdues at [% Branches.GetLoggedInBranchname | html %] › Circulation › Koha +[% FILTER collapse %] + [% tx("Overdues at {library}", { library = Branches.GetLoggedInBranchname }) | html %] › + [% t("Circulation") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt index d3e7369ffc..c8fc6c854c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt @@ -3,8 +3,13 @@ [% USE Branches %] [% USE ItemTypes %] [% USE AuthorisedValues %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Transfers › Circulation › Koha +[% FILTER collapse %] + [% t("Transfers") | html %] › + [% t("Circulation") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt index 82a4f5e1d5..ca4e065101 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt @@ -3,9 +3,14 @@ [% USE Koha %] [% USE KohaDates %] [% USE Branches %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Checkout notes › Circulation › Koha +[% FILTER collapse %] + [% t("Checkout notes") | html %] › + [% t("Circulation") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt index 1c2c071bcb..f06eecfa36 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt @@ -1,8 +1,12 @@ [% USE raw %] [% USE Koha %] [% USE Branches %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Circulation › Koha +[% FILTER collapse %] + [% t("Circulation") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] 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 6fc4e740c5..151b50d0f5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -14,12 +14,13 @@ [% INCLUDE 'doc-head-open.inc' %] [% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %] [% SET destination = "circ" %] - +<title>[% FILTER collapse %] [% IF patron %] - Checking out to [% INCLUDE 'patron-title.inc' invert_name = 1 no_html = 1 %] › [% END %] - - Circulation › Koha - + [% t("Checking out to") | html %] [% INCLUDE 'patron-title.inc' invert_name = 1 no_html = 1 %] › + [% END %] + [% t("Circulation") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] 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 f5396da1ba..1cab3f89f1 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 @@ -5,16 +5,18 @@ [% USE KohaDates %] [% USE Price %] [% USE AuthorisedValues %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] [% SET destination = "circ" %] - +<title>[% FILTER collapse %] [% IF patron %] - Batch check out to [% INCLUDE 'patron-title.inc' invert_name = 1 no_html = 1 %] › + [% t("Batch check out to") | html %] [% INCLUDE 'patron-title.inc' invert_name = 1 no_html = 1 %] › [% END %] - Circulation › Koha - + [% t("Circulation") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] 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 87ba7e7d8d..71a03a9e83 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 @@ -6,9 +6,14 @@ [% USE Asset %] [% USE raw %] [% USE To %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Curbside pickups › Circulation › Koha +[% FILTER collapse %] + [% t("Curbside pickups") | html %] › + [% t("Circulation") | html %] › + [% t("Koha") | html %] +[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt index 61a5686f18..45c8d1414b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -8,7 +8,11 @@ [% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Holds awaiting pickup › Circulation › Koha +[% FILTER collapse %] + [% t("Holds awaiting pickup") | html %] › + [% t("Circulation") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt index a5ade70cb3..c96c5550ab 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt @@ -3,13 +3,16 @@ [% USE Branches %] [% USE Koha %] [% USE KohaDates %] -[% SET footerjs = 1 %] [% USE AuthorisedValues %] [% USE TablesSettings %] [% USE Price %] - +[% PROCESS 'i18n.inc' %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -ILL requests › Koha +[% FILTER collapse %] + [% t("ILL requests") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] 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 87f43d90c1..670fe6b372 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -18,11 +18,16 @@ [% SET categories = Categories.all.unblessed %] [% SET columns = ['name', 'cardnumber', 'dateofbirth', 'category', 'branch', 'address', 'phone'] %] [% PROCESS "patron-search.inc" %] -[% UNLESS ( multi_hold ) %] - Place a hold on [% INCLUDE 'biblio-title-head.inc' %] › Holds › Circulation › Koha -[% ELSE %] - Confirm holds › Holds › Circulation › Koha -[% END %] +[% FILTER collapse %] + [% UNLESS ( multi_hold ) %] + [% t("Place a hold on") | html %] [% INCLUDE 'biblio-title-head.inc' %] › + [% ELSE %] + [% t("Confirm holds") | html %] › + [% END %] + [% t("Holds") | html %] › + [% t("Circulation") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] [% FILTER collapse %]