From aa6ecb6731ec0f4cac99f2f149d497002cfac097 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 6 Jun 2023 15:15:55 +0000 Subject: [PATCH] Bug 33915: Improve translation of title tags: Installer and onboarding This patch updates installer and onboarding templates so that title tags can be more easily translated. To test, apply the patch and run through the installation and onboarding process. At each stage confirm that the page title is correct. --- .../prog/en/modules/installer/auth.tt | 27 +++++--- .../prog/en/modules/installer/step1.tt | 16 +++-- .../prog/en/modules/installer/step2.tt | 9 ++- .../prog/en/modules/installer/step3.tt | 61 ++++++++++--------- .../en/modules/onboarding/onboardingstep1.tt | 8 ++- .../en/modules/onboarding/onboardingstep2.tt | 8 ++- .../en/modules/onboarding/onboardingstep3.tt | 9 ++- .../en/modules/onboarding/onboardingstep4.tt | 8 ++- .../en/modules/onboarding/onboardingstep5.tt | 14 +++-- 9 files changed, 107 insertions(+), 53 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt index 62f848b86f..863c17e542 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt @@ -1,12 +1,25 @@ +[% USE raw %] [% USE Koha %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] - - [% IF ( nopermission ) %]Access denied[% END %] - [% IF ( timed_out ) %]Session timed out[% END %] - [% IF ( different_ip ) %]IP address change[% END %] - [% IF ( invalid_username_or_password ) %]Invalid username or password[% END %] - [% IF ( loginprompt ) %]Log in to the Koha web installer[% END %] › Koha - +[% FILTER collapse %] + [% IF ( nopermission ) %] + [% t("Access denied") | html %] + [% END %] + [% IF ( timed_out ) %] + [% t("Session timed out") | html %] + [% END %] + [% IF ( different_ip ) %] + [% t("IP address change") | html %] + [% END %] + [% IF ( invalid_username_or_password ) %] + [% t("Invalid username or password") | html %] + [% END %] + [% IF ( loginprompt ) %] + [% t("Log in to the Koha web installer") | html %] + [% END %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'installer-doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt index 952855ee53..f9fe7293dc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt @@ -1,18 +1,22 @@ +[% USE raw %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] - +<title>[% FILTER collapse %] [% UNLESS ( language ) %] Choose your language [% END %] [% IF ( language ) %] [% UNLESS ( checkmodule ) %] [% IF ( missing_modules ) %] - Perl modules missing + [% t("Perl modules missing") | html %] [% END %] [% IF ( problems ) %] - Perl version obsolete + [% t("Perl version obsolete") | html %] [% END %] [% END %] - Check Perl dependencies - [% END %] › Web installer › Koha - + [% t("Check Perl dependencies") | html %] + [% END %] › + [% t("Web installer") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'installer-doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt index d9e528cb1c..e9ac424e91 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt @@ -1,5 +1,12 @@ +[% USE raw %] [% USE HtmlTags %] -[% INCLUDE 'doc-head-open.inc' %]Database settings › Web installer › Koha +[% PROCESS 'i18n.inc' %] +[% INCLUDE 'doc-head-open.inc' %] +[% FILTER collapse %] + [% t("Database settings") | html %] › + [% t("Web installer") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'installer-doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt index 126c18ecc5..8aed777f58 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt @@ -1,37 +1,40 @@ [% USE raw %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] - - [% IF ( proposeimport ) %] - Set up database - [% END %] - [% IF ( importdatastructure ) %] - [% IF ( error ) %] - Error creating database tables - [% ELSE %] - Database tables created - [% END %] - [% END %] - [% IF ( default ) %] - [% IF ( upgrading ) %] - Update database +<title>[% FILTER collapse %] + [% IF ( proposeimport ) %] + [% t("Set up database") | html %] + [% END %] + [% IF ( importdatastructure ) %] + [% IF ( error ) %] + [% t("Error creating database tables") | html %] [% ELSE %] - Install basic configuration settings + [% t("Database tables created") | html %] [% END %] - [% END %] - [% IF ( choosemarc ) %] - Select your MARC flavor - [% END %] - [% IF ( selectframeworks ) %] - Selecting default settings - [% END %] - [% IF ( addframeworks ) %] - Default data loaded - [% END %] - [% IF ( finish ) %] - Installation complete - [% END %] › Web installer › Koha - + [% END %] + [% IF ( default ) %] + [% IF ( upgrading ) %] + [% t("Update database") | html %] + [% ELSE %] + [% t("Install basic configuration settings") | html %] + [% END %] + [% END %] + [% IF ( choosemarc ) %] + [% t("Select your MARC flavor") | html %] + [% END %] + [% IF ( selectframeworks ) %] + [% t("Selecting default settings") | html %] + [% END %] + [% IF ( addframeworks ) %] + [% t("Default data loaded") | html %] + [% END %] + [% IF ( finish ) %] + [% t("Installation complete") | html %] + [% END %] › + [% t("Web installer") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'installer-doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt index b1f36ca9a3..e1cf606bf7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt @@ -1,6 +1,12 @@ +[% USE raw %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Create a library › Web installer › Koha +[% FILTER collapse %] + [% t("Create a library") | html %] › + [% t("Web installer") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'installer-doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt index 8105efb0aa..07e58dae05 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt @@ -1,7 +1,13 @@ +[% USE raw %] [% USE Koha %] [% USE KohaDates %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Add a patron category › Web installer › Koha +[% FILTER collapse %] + [% t("Add a patron category") | html %] › + [% t("Web installer") | html %] › + [% t("Koha") | html %] +[% END %] [%# The following if statement checks if the categories variable handed to this template %] [%# by onboarding.pl has data in it. If the categories variable does have data %] [%# in it this means that the user has previously imported sample patron category %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt index 4c96d28df9..bc8c777f58 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt @@ -1,8 +1,13 @@ -[% USE Koha %] [% USE raw %] +[% USE Koha %] [% USE Asset %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Create Koha administrator patron › Web installer › Koha +[% FILTER collapse %] + [% t("Create Koha administrator patron") | html %] › + [% t("Web installer") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'installer-doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt index 94ebc55255..8bdde97a7b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt @@ -1,5 +1,11 @@ +[% USE raw %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Create a new item type › Web installer › Koha +[% FILTER collapse %] + [% t("Create a new item type") | html %] › + [% t("Web installer") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'installer-doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt index 9daf2d73c9..4105d079db 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt @@ -1,11 +1,15 @@ +[% USE raw %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] - +<title>[% FILTER collapse %] [% IF all_done %] - Complete + [% t("Onboarding complete") | html %] [% ELSE %] - Create circulation rule - [% END %] › Web installer › Koha - + [% t("Create circulation rule") | html %] + [% END %] › + [% t("Web installer") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'installer-doc-head-close.inc' %] -- 2.30.2