Bugzilla – Attachment 155712 Details for
Bug 33927
Improve translation of title tags: Tools
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33927: Improve translation of title tags: Tools
Bug-33927-Improve-translation-of-title-tags-Tools.patch (text/plain), 17.35 KB, created by
Lucas Gass
on 2023-09-15 19:40:50 UTC
(
hide
)
Description:
Bug 33927: Improve translation of title tags: Tools
Filename:
MIME Type:
Creator:
Lucas Gass
Created:
2023-09-15 19:40:50 UTC
Size:
17.35 KB
patch
obsolete
>From 3d807c33395ec209ecae00adf7eca08962496d4a Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 15 Sep 2023 19:17:45 +0000 >Subject: [PATCH] Bug 33927: Improve translation of title tags: Tools > >This patch modifies tools templates so that title tags can be >more easily translated. The patch also makes some modifications to >titles, breadcrumb navigation, and page headers in order to make them >more consistent with each other and with other similar pages. > >To test, apply the patch and go to Tools. Test each of the following >pages and each variation of the page to confirm that titles, >breadcrumbs, and page headers look correct. > >- Tools home page >- Import patrons > - Import results >- Notices and slips > - Main page > - Main page filtered by library > - New notice > - Edit notice > - Preview notice: With a CHECKIN, CHECKOUT, or HOLD_SLIP notice, > fill in the "Data for preview" box in the "Email" section. > Although the template loads in a modal window which doesn't show > the page title, you can confirm that there are no errors. >- Overdue notice/status triggers >- Batch patron deletion > - Confirmation page >- Batch patron modification >- Batch extend due dates >- Upload patron images > >Print notices: With useDischarge enabled, log into the OPAC as a >user with no checkouts. Go to the "Ask for a discharge" tab and click >"Ask for a discharge." > >Locate the patron's record in the staff interface and click "Discharges" >in the left-hand sidebar menu. Click "Generate discharge." Open the >resulting PDF file in a browser. The page title should be "Print notices >for [date]." > >Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> >--- > .../prog/en/modules/batch/print-notices.tt | 9 +++-- > .../modules/tools/batch_extend_due_dates.tt | 34 ++++++++++++++-- > .../prog/en/modules/tools/cleanborrowers.tt | 15 ++++--- > .../prog/en/modules/tools/import_borrowers.tt | 18 +++++---- > .../prog/en/modules/tools/letter.tt | 39 ++++++++++++------ > .../prog/en/modules/tools/modborrowers.tt | 40 +++++++++++++++---- > .../prog/en/modules/tools/overduerules.tt | 6 ++- > .../prog/en/modules/tools/picture-upload.tt | 10 ++++- > .../prog/en/modules/tools/preview_letter.tt | 9 ++++- > .../prog/en/modules/tools/tools-home.tt | 7 +++- > 10 files changed, 143 insertions(+), 44 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt >index ae0c0aabcc..9c52d40267 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt >@@ -1,10 +1,13 @@ >-[% INCLUDE 'doc-head-open.inc' %] > [% USE raw %] >- <title>Print notices for [% today | html %]</title> >+[% PROCESS 'i18n.inc' %] >+[% INCLUDE 'doc-head-open.inc' %] >+ <title>[% FILTER collapse %] >+ [% tx("Print notices for {today}", { today = today }) | html %] >+ [% END %]</title> > > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <style> >- <!-- >+ <!-- > .message { page-break-after: always } > pre { font-family: monospace } > pre {white-space: pre-wrap;} >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt >index 36d14f5eeb..9e4224a5bd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt >@@ -1,14 +1,23 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% USE Branches %] > [% USE Categories %] > [% USE KohaDates %] > [% USE ItemTypes %] > [% PROCESS 'html_helpers.inc' %] >- > [% INCLUDE 'doc-head-open.inc' %] >-<title>Batch extend due dates › Tools › Koha</title> >+<title>[% FILTER collapse %] >+ [% IF ( view == 'list' ) %] >+ [% t("Confirm selection") | html %] › >+ [% ELSIF ( view == 'report' ) %] >+ [% t("Results") | html %] › >+ [% END %] >+ [% t("Batch extend due dates") | html %] › >+ [% t("Tools") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% Asset.css("css/humanmsg.css") | $raw %] > </head> >@@ -23,8 +32,23 @@ > [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> > [% END %] >- [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>Batch extend due dates</span> >+ [% IF ( view == 'list' || view == 'report' ) %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/tools/batch_extend_due_dates.pl">Batch extend due dates</a> >+ [% END %] >+ [% ELSE %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Batch extend due dates</span> >+ [% END %] >+ [% END %] >+ [% IF ( view == 'list' ) %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% t("Confirm selection") | html %] >+ [% END %] >+ [% ELSIF ( view == 'report' ) %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% t("Results") | html %] >+ [% END %] > [% END %] > [% END #/ WRAPPER breadcrumbs %] > [% END #/ WRAPPER sub-header.inc %] >@@ -173,6 +197,8 @@ > </div> > [% END %] > [% ELSIF view == 'report' %] >+ <h2>Results</h2> >+ > <div class="dialog message"> > Due dates have been modified! > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt >index 3f7607347e..93621378f1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt >@@ -3,15 +3,20 @@ > [% USE Koha %] > [% USE KohaDates %] > [% USE Branches %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >+<title>[% FILTER collapse %] > [% IF step == 2 %] >- Confirm › [% END %] >+ [% t("Confirm") | html %] › >+ [% END %] > [% IF step == 3 %] >- Finished › [% END %] >- Batch patron deletion and anonymization › Tools › Koha >-</title> >+ [% t("Finished") | html %] › >+ [% END %] >+ [% t("Batch patron deletion and anonymization") | html %] › >+ [% t("Tools") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt >index 4366ae4655..ce839f21e8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt >@@ -2,13 +2,17 @@ > [% USE Asset %] > [% USE Koha %] > [% USE Branches %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >+<title>[% FILTER collapse %] > [% IF ( uploadborrowers ) %] >- Results › [% END %] >- Import patrons › Tools › Koha >-</title> >+ [% t("Results") | html %] › >+ [% END %] >+ [% t("Import patrons") | html %] › >+ [% t("Tools") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <style> > label.description { width: 20em; } >@@ -52,7 +56,7 @@ > <div class="col-sm-6"> > <h1>Import patrons</h1> > [% IF ( uploadborrowers ) %] >- <h5>Import results :</h5> >+ <h2>Import results</h2> > <ul> > <li>[% imported | html %] imported records [% IF ( lastimported ) %](last was [% lastimported | html %])[% END %]</li> > [% IF imported and patronlistname %] >@@ -69,7 +73,7 @@ > <br /><br /> > > <div> >- <h5>Feedback:</h5> >+ <h2>Feedback</h2> > <ul class="feedback"> > [% FOREACH f IN feedback %] > <li> >@@ -94,7 +98,7 @@ > <br /><br /> > > <div> >- <h5>Error analysis:</h5> >+ <h2>Error analysis</h2> > <ul> > [% FOREACH e IN errors %] > [% IF ( e.badheader ) %]<li>Header row could not be parsed</li>[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >index 15e2633ef0..9d773dd96a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >@@ -7,21 +7,27 @@ > [% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >+<title>[% FILTER collapse %] > [% IF ( add_form or copy_form ) %] > [% IF ( modify ) %] >- Modify notice › [% ELSE %] >- Add notice › [% END %] >+ [% t("Modify notice") | html %] › >+ [% ELSE %] >+ [% t("New notice") | html %] › >+ [% END %] > [% END %] >- > [% IF ( add_validate or copy_validate) %] >- Notice added › [% END %] >- >+ [% t("Notice added") | html %] › >+ [% END %] > [% IF ( delete_confirm ) %] >- Confirm deletion › [% END %] >- >- Notices › Tools › Koha >-</title> >+ [% t("Confirm deletion") | html %] › >+ [% END %] >+ [% IF ( branchcode ) %] >+ [% Branches.GetName( branchcode ) | html %] › >+ [% END %] >+ [% t("Notices and slips") | html %] › >+ [% t("Tools") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% FILTER collapse %] > <style> >@@ -60,7 +66,7 @@ > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> > [% END %] > >- [% IF ( add_form OR copy_form OR add_validate OR copy_validate OR delete_confirm ) %] >+ [% IF ( add_form OR copy_form OR add_validate OR copy_validate OR delete_confirm OR branchcode ) %] > [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/tools/letter.pl">Notices and slips</a> > [% END %] >@@ -73,9 +79,13 @@ > [% END %] > [% ELSE %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>Add notice</span> >+ <span>New notice</span> > [% END %] > [% END # /IF modify %] >+ [% ELSIF ( branchcode ) %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% Branches.GetName( branchcode ) | html %] >+ [% END %] > [% ELSE %] > [% IF ( add_validate or copy_validate) %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >@@ -129,6 +139,9 @@ > > [% IF ( no_op_set ) %] > <h1>Notices and slips</h1> >+ [% IF ( branchcode ) %] >+ <h2>[% Branches.GetName( branchcode ) | html %]</h2> >+ [% END %] > <form method="get" action="/cgi-bin/koha/tools/letter.pl" id="selectlibrary"> > <input type="hidden" name="searchfield" value="[% searchfield | html %]" /> > [% UNLESS independant_branch %] >@@ -266,7 +279,7 @@ > [% IF ( modify ) %] > <span>Modify notice</span> > [% ELSE %] >- <span>Add notice</span> >+ <span>New notice</span> > [% END %] > </h1> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >index d66fd48da5..08680209f4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >@@ -5,9 +5,21 @@ > [% USE Branches %] > [% USE Categories %] > [% USE TablesSettings %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Batch patron modification › Tools › Koha</title> >+<title>[% FILTER collapse %] >+ [% IF ( op == 'show' or op == 'show_results' ) %] >+ [% IF ( op == 'show' ) %] >+ [% t("Modifications") | html %] › >+ [% ELSE %] >+ [% t("Results") | html %] › >+ [% END %] >+ [% END %] >+ [% t("Batch patron modification") | html %] › >+ [% t("Tools") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -21,8 +33,23 @@ > [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> > [% END %] >- [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>Batch patron modification</span> >+ [% IF ( op == 'show' or op == 'show_results' ) %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/tools/modborrowers.pl">Batch patron modification</a> >+ [% END %] >+ [% IF ( op == 'show' ) %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% t("Modifications") | html %] >+ [% END %] >+ [% ELSE %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% t("Results")| html %] >+ [% END %] >+ [% END %] >+ [% ELSE %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Batch patron modification</span> >+ [% END %] > [% END %] > [% END #/ WRAPPER breadcrumbs %] > [% END #/ WRAPPER sub-header.inc %] >@@ -142,10 +169,9 @@ > [% END #Alert if no patrons %] > > [% IF ( op == 'show' or op == 'show_results' ) %] >- [% IF ( op == 'show' ) %] >- <h1>Batch patrons modification</h1> >- [% ELSE %] >- <h1>Batch patrons results</h1> >+ <h1>Batch patron modification</h1> >+ [% UNLESS ( op == 'show' ) %] >+ <h2>Results</h2> > [% END %] > [% IF ( notfoundcardnumbers ) %] > [% IF ( useborrowernumbers ) -%] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt >index 953de54feb..a13d78a3d6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt >@@ -5,7 +5,11 @@ > [% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Overdue notice/status triggers › Tools › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("Overdue notice/status triggers") | html %] › >+ [% t("Tools") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt >index 91d7264f02..bf55d2ec5c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt >@@ -1,8 +1,16 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Upload patron images › Tools › Koha</title> >+<title>[% FILTER collapse %] >+ [% IF ( TOTAL ) %] >+ [% t("Results") | html %] › >+ [% END %] >+ [% t("Upload patron images") | html %] › >+ [% t("Tools") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt >index fb7b0f5fbe..7a9fa85826 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt >@@ -1,5 +1,12 @@ >+[% USE raw %] >+[% PROCESS 'i18n.inc' %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Preview notice template › Tools › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("Preview notice template") | html %] › >+ [% t("Notices") | html %] › >+ [% t("Tools") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > </head> > <body id="preview_letter" class="catalog"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt >index c2638ace0b..b805c6d1b7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt >@@ -2,9 +2,12 @@ > [% USE Koha %] > [% USE Branches %] > [% USE Registers %] >- >+[% PROCESS 'i18n.inc' %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Tools › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("Tools") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="tools_tools-home" class="tools"> >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 33927
:
155711
|
155712
|
156025