From f9d5bcfbfebc08cdb3e5925bb5be33b20d823cc5 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 27 Feb 2023 11:33:22 +0000 Subject: [PATCH] Bug 33077: Improve ease of translating template title tags This patch uses the cities administration page as a proof-of-concept for using the [% t() %] construction to wrap translatable string in template tags. This should result in a significant improvement in translatability. To test, apply the patch and run the translation script to update the .po files, e.g. perl misc/translator/translate update fr-FR Check the updated .po files: - In fr-FR-staff-prog.po you should no longer see a reference to cities.tt line 6, "#: koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt:6" - In fr-FR-messages.po you should see several strings which have been pulled individually from the <title> tag: - cities.tt:9, msgid "Modify city" - cities.tt:11, msgid "New city" - cities.tt:15, msgid "Confirm deletion of city" - cities.tt:19, msgid "Administration", msgid "Cities", msgid "Koha", and msgid "Administration" Translate the strings in fr-FR-messages.po and install the updated translation: perl misc/translator/translate install fr-FR Swith to the update language in the staff interface and confirm that the Cities page title is translated correctly. Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> (cherry picked from commit 7020b90f305fbdf584b57f61e39d259d3f9e0d22) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> (cherry picked from commit 66b7de2ec2ee429b40831cdef68161ab18bb0035) Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> --- .../prog/en/modules/admin/cities.tt | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) 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 acf37fdd6e..fc5c516470 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt @@ -2,19 +2,22 @@ [% USE Asset %] [% SET footerjs = 1 %] [% USE TablesSettings %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -<title> +<title>[% FILTER collapse %] [% IF op =='add_form' %] [% IF city.cityid %] - Modify city + [% t("Modify city") | html %] [% ELSE %] - New city - [% END %] › [% ELSE %] + [% t("New city") | html %] + [% END %] › + [% ELSE %] [% IF op == 'delete_confirm' %] - Confirm deletion of city › [% END %] + [% t("Confirm deletion of city") | html %] › + [% END %] [% END %] - Cities › Administration › Koha - + [% t("Cities") | html %] › [% t("Administration") | html %] › [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] -- 2.39.5