Attachment 155109 Details for Bug 33921 – Bug 33921: Improve translation of title tags: Plugins and Point of sale

[patch] Bug 33921: Improve translation of title tags: Plugins and Point of sale

Bug-33921-Improve-translation-of-title-tags-Plugin.patch (text/plain), 8.64 KB, created by Jonathan Druart on 2023-09-01 12:20:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2023-09-01 12:20:11 UTC

Size: 8.64 KB

patch

obsolete

>From 912241c771d9989cbcad817a49287451d1167814 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 6 Jun 2023 15:24:02 +0000
>Subject: [PATCH] Bug 33921: Improve translation of title tags: Plugins and
> Point of sale
>
>This patch updates plugin and point of sale 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:
>
>- Administration ->
>  - Manage plugins
>  - Upload plugin
>
>  * With 'useplugins' set to 0 in koha-conf.xml you can navigate
>  directly to /cgi-bin/koha/plugins/plugins-home.pl to confirm that
>  the "Plugins disabled" page is shown.
>
>With EnablePointOfSale and UseCashRegisters enabled:
>
>- Point of sale
>  - Make a sale and print a receipt for the transaction
>  - Transaction history for [register]
>  - Cash summary for [library]
>
>Signed-off-by: Andrew Auld <andrew.auld@ptfs-europe.com>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> .../prog/en/modules/plugins/plugins-disabled.tt   |  9 +++++++--
> .../prog/en/modules/plugins/plugins-home.tt       | 15 ++++++++-------
> .../prog/en/modules/plugins/plugins-upload.tt     | 11 ++++++++---
> .../intranet-tmpl/prog/en/modules/pos/pay.tt      |  6 +++++-
> .../prog/en/modules/pos/printreceipt.tt           |  5 ++++-
> .../intranet-tmpl/prog/en/modules/pos/register.tt |  9 +++++----
> .../prog/en/modules/pos/registers.tt              |  9 +++++----
> 7 files changed, 42 insertions(+), 22 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt
>index 9b799ccae28..e23fe820690 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt
>@@ -1,6 +1,11 @@
> [% USE raw %]
>+[% PROCESS 'i18n.inc' %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Upload plugin &rsaquo; Plugins &rsaquo; Tools &rsaquo; Koha</title>
>+<title>[% FILTER collapse %]
>+    [% t("Plugins disabled") | html %] &rsaquo;
>+    [% t("Plugins") | html %] &rsaquo;
>+    [% t("Koha") | html %]
>+[% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% INCLUDE 'calendar.inc' %]
> </head>
>@@ -24,7 +29,7 @@
>     <div class="container-fluid">
>         <div class="row">
>             <div class="col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3">
>-                <h1>Plugins disabled!</h1>
>+                <h1>Plugins disabled</h1>
> 
>                 <p>To enable Koha plugins, the flag enable_plugins must be set in the Koha configuration file</p>
>             </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
>index 3dad8c1ea93..1ee0768912b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
>@@ -1,17 +1,18 @@
> [% USE raw %]
> [% USE Asset %]
> [% USE KohaDates %]
>+[% PROCESS 'i18n.inc' %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>
>-    Plugins &rsaquo;
>+<title>[% FILTER collapse %]
>+    [% t("Plugins") | html %] &rsaquo;
>     [% IF ( method == 'tool' ) %]
>-        Tools
>+        [% t("Tools") | html %]
>     [% ELSE %]
>-        Administration
>-    [% END %]
>-    &rsaquo; Koha
>- </title>
>+        [% t("Administration") | html %]
>+    [% END %] &rsaquo;
>+    [% t("Koha") | html %]
>+[% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
>index 96e74dc7f61..3756de7f781 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
>@@ -1,6 +1,11 @@
> [% USE raw %]
>+[% PROCESS 'i18n.inc' %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Upload plugin &rsaquo; Plugins &rsaquo; Tools &rsaquo; Koha </title>
>+<title>[% FILTER collapse %]
>+    [% t("Upload plugin") | html %] &rsaquo;
>+    [% t("Plugins") | html %] &rsaquo;
>+    [% t("Koha") | html %]
>+[% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% INCLUDE 'calendar.inc' %]
> </head>
>@@ -16,7 +21,7 @@
>                 <a href="/cgi-bin/koha/plugins/plugins-home.pl">Plugins</a>
>             [% END %]
>             [% WRAPPER breadcrumb_item bc_active= 1 %]
>-                <wrap>Upload plugins</wrap>
>+                <span>Upload plugin</span>
>             [% END %]
>         [% END #/ WRAPPER breadcrumbs %]
>     [% END #/ WRAPPER sub-header.inc %]
>@@ -25,7 +30,7 @@
>         <div class="row">
>             <div class="col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3">
> 
>-                <h1>Upload Koha plugin</h1>
>+                <h1>Upload plugin</h1>
>                 [% IF ( ERRORS ) %]
>                 <div class="dialog alert">
>                     [% FOREACH ERROR IN ERRORS %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
>index 62893aca8c3..0b97e033037 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
>@@ -5,10 +5,14 @@
> [% USE Price %]
> [% USE TablesSettings %]
> [% USE Registers %]
>+[% PROCESS 'i18n.inc' %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
> [% SET registers = Registers.all( filters => { current_branch => 1 } ) %]
>-<title>Payments &rsaquo; Koha</title>
>+<title>[% FILTER collapse %]
>+    [% t("Point of sale") | html %] &rsaquo;
>+    [% t("Koha") | html %]
>+[% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/printreceipt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/printreceipt.tt
>index 581d5668fb9..7374498b32f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/printreceipt.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/printreceipt.tt
>@@ -1,10 +1,13 @@
> [% USE raw %]
> [% USE Asset %]
> [% USE Koha %]
>+[% PROCESS 'i18n.inc' %]
> [% SET footerjs = 1 %]
> 
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Print receipt</title>
>+<title>[% FILTER collapse %]
>+    [% t("Print receipt") | html %]
>+[% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> 
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
>index 81178fad679..bb00da9cc2c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
>@@ -4,10 +4,14 @@
> [% USE KohaDates %]
> [% USE AuthorisedValues %]
> [% USE Price %]
>+[% PROCESS 'i18n.inc' %]
> [% SET footerjs = 1 %]
> [% PROCESS 'accounts.inc' %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Cashup &rsaquo; Koha</title>
>+<title>[% FILTER collapse %]
>+    [% tx("Transaction history for {register}", { register = register.name }) | html %] &rsaquo;
>+    [% t("Koha") | html %]
>+[% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %]
> </head>
>@@ -19,9 +23,6 @@
> 
> [% WRAPPER 'sub-header.inc' %]
>     [% WRAPPER breadcrumbs %]
>-        [% WRAPPER breadcrumb_item %]
>-            <a href="/cgi-bin/koha/pos/pay.pl">Cash management</a>
>-        [% END %]
>         [% WRAPPER breadcrumb_item bc_active= 1 %]
>             <span>Transaction history for [% register.name | html %]</span>
>         [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
>index 9a0764a8c96..61a053e9875 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
>@@ -3,9 +3,13 @@
> [% USE Koha %]
> [% USE KohaDates %]
> [% USE Price %]
>+[% PROCESS 'i18n.inc' %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Cashup &rsaquo; Koha</title>
>+<title>[% FILTER collapse %]
>+    [% tx("Cash summary for {library}", { library = library.branchname }) | html %] &rsaquo;
>+    [% t("Koha") | html %]
>+[% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>@@ -16,9 +20,6 @@
> 
>     [% WRAPPER 'sub-header.inc' %]
>         [% WRAPPER breadcrumbs %]
>-            [% WRAPPER breadcrumb_item %]
>-                    <a href="/cgi-bin/koha/pos/pay.pl">Cash management</a>
>-            [% END %]
>             [% WRAPPER breadcrumb_item bc_active= 1 %]
>                 <span>Cash summary for [% library.branchname | html %]</span>
>             [% END %]
>-- 
>2.25.1

Actions: View | Diff | Splinter Review

Attachments on bug 33921: 154698 | 155070 | 155109