From cdf2dfeceb7129713f6d22b288a432927e77198e Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 6 Jun 2023 15:26:33 +0000 Subject: [PATCH] Bug 33923: Improve translation of title tags: Reports This patch updates reports 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: - Reports -> - Reports home - Statistics wizards -> - Acquisitions - Patrons - Catalog - Circulation - Serials - Cash register - Holds - Top lists -> - Patrons with the most checkouts - Most-circulated items - Inactive - Patrons who haven't checked out - Items with no checkouts - Other - Items lost - Orders by fund - Catalog by item type - Average loan time - Create guided report - Create from SQL - Use saved report - View dictionary Signed-off-by: Andrew Auld Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi --- .../mana/mana-report-search-result.inc | 8 ++- .../en/modules/reports/acquisitions_stats.tt | 10 +++- .../prog/en/modules/reports/bor_issues_top.tt | 7 ++- .../prog/en/modules/reports/borrowers_out.tt | 7 ++- .../en/modules/reports/borrowers_stats.tt | 10 +++- .../en/modules/reports/cash_register_stats.tt | 10 +++- .../prog/en/modules/reports/cat_issues_top.tt | 10 +++- .../prog/en/modules/reports/catalogue_out.tt | 7 ++- .../en/modules/reports/catalogue_stats.tt | 10 +++- .../prog/en/modules/reports/convert_report.tt | 8 ++- .../prog/en/modules/reports/dictionary.tt | 8 ++- .../modules/reports/guided_reports_start.tt | 50 ++++++++++++------- .../en/modules/reports/issues_avg_stats.tt | 7 ++- .../prog/en/modules/reports/issues_stats.tt | 10 +++- .../prog/en/modules/reports/itemslost.tt | 7 ++- .../prog/en/modules/reports/itemtypes.tt | 7 ++- .../en/modules/reports/orders_by_budget.tt | 7 ++- .../prog/en/modules/reports/reports-home.tt | 8 ++- .../prog/en/modules/reports/reserves_stats.tt | 10 +++- .../prog/en/modules/reports/serials_stats.tt | 7 ++- 20 files changed, 170 insertions(+), 38 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc index 9f5f304bfd..646671531a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc @@ -4,9 +4,13 @@ [% USE AuthorisedValues %] [% USE Branches %] [% USE raw %] - +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Mana Knowledge Base reports search › Reports › Koha +[% FILTER collapse %] + [% t("Mana Knowledge Base reports search") | html %] › + [% t("Reports") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("css/reports.css") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt index 557507594a..e717fd904a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt @@ -1,7 +1,15 @@ [% USE raw %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -[% IF ( do_it ) %]Acquisitions statistics › Results[% ELSE %]Acquisitions statistics[% END %] › Reports › Koha +[% FILTER collapse %] + [% IF( do_it ) %] + [% t("Results") | html %] › + [% END %] + [% t("Acquisitions statistics") | html %] › + [% t("Reports") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt index 9c0fcdfac1..2cbeb32292 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt @@ -2,9 +2,14 @@ [% USE Branches %] [% USE KohaDates %] [% USE ItemTypes %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Patrons with the most checkouts › Reports › Koha +[% FILTER collapse %] + [% t("Patrons with the most checkouts") | html %] › + [% t("Reports") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt index 484eedfad0..aa895c994c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt @@ -1,7 +1,12 @@ [% USE raw %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Patrons with no checkouts › Reports › Koha +[% FILTER collapse %] + [% t("Patrons with no checkouts") | html %] › + [% t("Reports") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt index 4c025c25e9..b1d18ce69d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt @@ -2,9 +2,17 @@ [% USE Branches %] [% USE Koha %] [% USE Asset %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -[% IF ( do_it ) %]Patrons statistics › Results[% ELSE %]Patrons statistics[% END %] › Reports › Koha +[% FILTER collapse %] + [% IF( do_it ) %] + [% t("Results") | html %] › + [% END %] + [% t("Patrons statistics") | html %] › + [% t("Reports") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt index be0b2304c2..e452fe4162 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -22,23 +22,39 @@ [% INCLUDE 'doc-head-open.inc' %] - - [%- IF ( saved1 ) -%] - Saved reports › [%- ELSIF ( create ) -%] - Create from SQL › [%- ELSIF ( showsql ) -%] - SQL view › Saved reports › [%- ELSIF ( execute ) -%] - Report [% name | html %] ([% id | html %]) › Saved reports › [%- ELSIF ( editsql ) -%] - Edit report [% reportname | html %] ([% id | html %]) › Saved reports › [%- END -%] - - [%- IF ( build1 ) -%] - Build a report, step 1 of 6: Choose a module › [%- ELSIF ( build2 ) -%] - Build a report, step 2 of 6: Pick a report type › [%- ELSIF ( build3 ) -%] - Build a report, step 3 of 6: Select columns for display › [%- ELSIF ( build4 ) -%] - Build a report, step 4 of 6: Select criteria to limit on › [%- ELSIF ( build5 ) -%] - Build a report, step 5 of 6: Pick which columns to total › [%- ELSIF ( build6 ) -%] - Build a report, step 6 of 6: Select how you want the report ordered › [%- END -%] - Guided reports wizard › Reports › Koha - +[% FILTER collapse %] + [% IF ( saved1 ) %] + [% t("Saved reports") | html %] › + [% ELSIF ( create ) %] + [% t("Create from SQL") | html %] › + [% ELSIF ( showsql ) %] + [% t("SQL view") | html %] › + [% t("Saved reports") | html %] › + [% ELSIF ( execute ) %] + [% tx("Report {reportname} ({id})", { reportname = name, id = id }) | html %] › + [% t("Saved reports") | html %] › + [% ELSIF ( editsql ) %] + [% tx("Edit report {reportname} ({id})", { reportname = reportname, id = id }) | html %] › + [% t("Saved reports") | html %] › + [% END %] + + [% IF ( build1 ) %] + [% t("Build a report, step 1 of 6: Choose a module") | html %] › + [% ELSIF ( build2 ) %] + [% t("Build a report, step 2 of 6: Pick a report type") | html %] › + [% ELSIF ( build3 ) %] + [% t("Build a report, step 3 of 6: Select columns for display") | html %] › + [% ELSIF ( build4 ) %] + [% t("Build a report, step 4 of 6: Select criteria to limit on") | html %] › + [% ELSIF ( build5 ) %] + [% t("Build a report, step 5 of 6: Pick which columns to total") | html %] › + [% ELSIF ( build6 ) %] + [% t("Build a report, step 6 of 6: Select how you want the report ordered") | html %] › + [% END %] + [% t("Guided reports wizard") | html %] › + [% t("Reports") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("lib/codemirror/codemirror.min.css") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt index 3b98f0be2c..0843aa4212 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt @@ -1,8 +1,13 @@ [% USE raw %] [% USE Branches %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Average loan time › Reports › Koha +[% FILTER collapse %] + [% t("Average loan time") | html %] › + [% t("Reports") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt index ab28f1f198..6702b45055 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt @@ -1,8 +1,16 @@ [% USE raw %] [% USE Branches %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Circulation statistics[% IF ( do_it ) %] › Results[% END %] › Reports › Koha +[% FILTER collapse %] + [% IF ( do_it ) %] + [% t("Results") | html %] › + [% END %] + [% t("Circulation statistics") | html %] › + [% t("Reports") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %]