From 3f6b9565339a929c05a95e5062b19d86579b8e07 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 6 Jun 2023 15:14:31 +0000 Subject: [PATCH] Bug 33919: Improve translation of title tags: Patron clubs This patch updates patron clubs templates so that title tags can be more easily translated. The patch also makes some minor changes to some templates to improve consistency between page title, breadcrumb navigation, and page heading. To test, apply the patch and confirm that the following pages have the correct title tags: - Tools -> Patron clubs - New and Edit club template - New and Edit club - Club enrollments (from the list of clubs choose Actions -> Enrollments) Signed-off-by: Salah Ghedda Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/clubs/club-enrollments.tt | 15 ++++++++++----- .../prog/en/modules/clubs/clubs-add-modify.tt | 14 +++++++++----- .../prog/en/modules/clubs/clubs.tt | 7 ++++++- .../en/modules/clubs/templates-add-modify.tt | 18 +++++++++++------- 4 files changed, 36 insertions(+), 18 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt index 8bd3e534da..252f219d8f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt @@ -3,11 +3,16 @@ [% USE KohaDates %] [% USE Branches %] [% USE Koha %] -[% USE AuthorisedValues %] -[% SET AuthorisedValuesCategories = AuthorisedValues.GetCategories %] +[% USE HtmlTags %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Club enrollments › Patron clubs › Tools › Koha +[% FILTER collapse %] + [% tx("Club enrollments for {club_name}", { club_name = club.name }) | html %] › + [% t("Patron clubs") | html %] › + [% t("Tools") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -25,7 +30,7 @@ Patron clubs [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Club enrollments + Club enrollments for [% club.name | html | $HtmlTags tag="em" %] [% END %] [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] @@ -37,7 +42,7 @@ [% IF !club %]
The club you requested does not exist.
[% ELSE %] -

Club enrollments for [% club.name | html %]

+

Club enrollments for [% club.name | html | $HtmlTags tag="em" %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt index ebbb27897a..3be9e0407c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt @@ -3,15 +3,19 @@ [% USE KohaDates %] [% USE Branches %] [% USE AuthorisedValues %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] - +<title>[% FILTER collapse %] [% IF club %] - Modify club [% club.name | html %] + [% tx("Modify club {club_name}", { club_name = club.name }) | html %] [% ELSE %] - Create a new [% club_template.name | html %] club - [% END %] › Patron clubs › Tools › Koha - + [% tx("Create a new {club_template} club", { club_template = club_template.name }) | html %] + [% END %] › + [% t("Patron clubs") | html %] › + [% t("Tools") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt index dd7c26a781..aa8076a6db 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt @@ -3,9 +3,14 @@ [% USE KohaDates %] [% USE Branches %] [% USE Koha %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Patron clubs › Tools › Koha +[% FILTER collapse %] + [% t("Patron clubs") | html %] › + [% t("Tools") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt index bb4d3e5738..e3341bfc03 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt @@ -2,15 +2,19 @@ [% USE Branches %] [% USE AuthorisedValues %] [% USE HtmlTags %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] - +<title>[% FILTER collapse %] [% IF club_template %] - Modify club template [% club_template.name | html %] + [% tx("Modify club template {club_template}", { club_template = club_template.name }) | html %] › [% ELSE %] - Create a new club template - [% END %] › Patron clubs › Tools › Koha - + [% t("New club template") | html %] + [% END %] › + [% t("Patron clubs") | html %] › + [% t("Tools") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %]