Attachment 154898 Details for Bug 33915 – Bug 33915: Improve translation of title tags: Installer and onboarding

[patch] Bug 33915: Improve translation of title tags: Installer and onboarding

Bug-33915-Improve-translation-of-title-tags-Instal.patch (text/plain), 10.73 KB, created by David Nind on 2023-08-29 10:29:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2023-08-29 10:29:34 UTC

Size: 10.73 KB

patch

obsolete

>From c32e772874ec9eaa6a9c3c6484fa802cadb470d6 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>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.
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> .../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' %]
>-<title>
>-    [% 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 %] &rsaquo; Koha
>-</title>
>+<title>[% 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 %] &rsaquo;
>+    [% t("Koha") | html %]
>+[% END %]</title>
> [% INCLUDE 'installer-doc-head-close.inc' %]
> </head>
> 
>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>
>+<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 %] &rsaquo; Web installer &rsaquo; Koha
>-</title>
>+        [% t("Check Perl dependencies") | html %]
>+    [% END %] &rsaquo;
>+    [% t("Web installer") | html %] &rsaquo;
>+    [% t("Koha") | html %]
>+[% END %]</title>
> [% INCLUDE 'installer-doc-head-close.inc' %]
> </head>
> 
>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 b5af87bf64..0bca0ed0b6 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' %]<title>Database settings &rsaquo; Web installer &rsaquo; Koha</title>
>+[% PROCESS 'i18n.inc' %]
>+[% INCLUDE 'doc-head-open.inc' %]
>+<title>[% FILTER collapse %]
>+    [% t("Database settings") | html %] &rsaquo;
>+    [% t("Web installer") | html %] &rsaquo;
>+    [% t("Koha") | html %]
>+[% END %]</title>
> [% INCLUDE 'installer-doc-head-close.inc' %]
> </head>
> 
>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 4d5053e791..3198cddd9d 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' %]
> 
>-<title>
>-     [% 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 %] &rsaquo; Web installer &rsaquo; Koha
>-</title>
>+    [% 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 %] &rsaquo;
>+    [% t("Web installer") | html %] &rsaquo;
>+    [% t("Koha") | html %]
>+[% END %]</title>
> 
> [% INCLUDE 'installer-doc-head-close.inc' %]
> </head>
>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' %]
> 
>-<title>Create a library &rsaquo; Web installer &rsaquo; Koha</title>
>+<title>[% FILTER collapse %]
>+    [% t("Create a library") | html %] &rsaquo;
>+    [% t("Web installer") | html %] &rsaquo;
>+    [% t("Koha") | html %]
>+[% END %]</title>
> [% INCLUDE 'installer-doc-head-close.inc' %]
> </head>
> 
>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' %]
>-<title>Add a patron category &rsaquo; Web installer &rsaquo; Koha</title>
>+<title>[% FILTER collapse %]
>+    [% t("Add a patron category") | html %] &rsaquo;
>+    [% t("Web installer") | html %] &rsaquo;
>+    [% t("Koha") | html %]
>+[% END %]</title>
> [%# 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' %]
>-<title>Create Koha administrator patron &rsaquo; Web installer &rsaquo; Koha</title>
>+<title>[% FILTER collapse %]
>+    [% t("Create Koha administrator patron") | html %] &rsaquo;
>+    [% t("Web installer") | html %] &rsaquo;
>+    [% t("Koha") | html %]
>+[% END %]</title>
> [% INCLUDE 'installer-doc-head-close.inc' %]
> </head>
> 
>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' %]
>-<title>Create a new item type &rsaquo; Web installer &rsaquo; Koha</title>
>+<title>[% FILTER collapse %]
>+    [% t("Create a new item type") | html %] &rsaquo;
>+    [% t("Web installer") | html %] &rsaquo;
>+    [% t("Koha") | html %]
>+[% END %]</title>
> [% INCLUDE 'installer-doc-head-close.inc' %]
> </head>
> 
>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>
>+<title>[% FILTER collapse %]
>     [% IF all_done %]
>-        Complete
>+        [% t("Onboarding complete") | html %]
>     [% ELSE %]
>-        Create circulation rule
>-    [% END %] &rsaquo; Web installer &rsaquo; Koha
>-</title>
>+        [% t("Create circulation rule") | html %]
>+    [% END %] &rsaquo;
>+    [% t("Web installer") | html %] &rsaquo;
>+    [% t("Koha") | html %]
>+[% END %]</title>
> [% INCLUDE 'installer-doc-head-close.inc' %]
> </head>
> 
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 33915: 152312 | 154898 | 155086