Bugzilla – Attachment 154689 Details for
Bug 33916
Improve translation of title tags: Labels
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33916: Improve translation of title tags: Labels
Bug-33916-Improve-translation-of-title-tags-Labels.patch (text/plain), 16.57 KB, created by
Owen Leonard
on 2023-08-22 12:58:31 UTC
(
hide
)
Description:
Bug 33916: Improve translation of title tags: Labels
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2023-08-22 12:58:31 UTC
Size:
16.57 KB
patch
obsolete
>From f7eafabf449d83036568d75368834262b62581bb Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 6 Jun 2023 15:16:45 +0000 >Subject: [PATCH] Bug 33916: Improve translation of title tags: Labels > >This patch label creator 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: > >- Cataloging -> Label creator home > - Manage -> Label batches > - Edit -> > - Click the "Add item(s)" button without entering any barcodes or > item numbers in the form. > - Test the search form and search results > - Manage -> Layouts > - Manage -> Label templates > - Manage -> Printer profiles > - New -> Label batch > - New -> Layout > - New -> Label template > - New -> Printer profile > - New -> Barcode range >- Cataloging -> Barcode image generator >- Cataloging -> Quick spine label creator >--- > .../prog/en/modules/labels/barcode-print.tt | 8 ++++- > .../en/modules/labels/label-edit-batch.tt | 13 ++++++- > .../en/modules/labels/label-edit-layout.tt | 13 ++++++- > .../en/modules/labels/label-edit-profile.tt | 13 ++++++- > .../en/modules/labels/label-edit-range.tt | 8 ++++- > .../en/modules/labels/label-edit-template.tt | 13 ++++++- > .../prog/en/modules/labels/label-home.tt | 7 +++- > .../prog/en/modules/labels/label-manage.tt | 34 +++++++++++-------- > .../prog/en/modules/labels/label-print.tt | 7 +++- > .../prog/en/modules/labels/result.tt | 7 +++- > .../prog/en/modules/labels/search.tt | 9 +++-- > .../prog/en/modules/labels/spinelabel-home.tt | 10 ++++-- > .../en/modules/labels/spinelabel-print.tt | 7 +++- > 13 files changed, 120 insertions(+), 29 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt >index e2e7d0ebb4..9d96db2b4d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt >@@ -1,7 +1,13 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] >-[% INCLUDE 'doc-head-open.inc' %]<title>Barcode image generator › Cataloging › Koha</title> >+[% INCLUDE 'doc-head-open.inc' %] >+<title>[% FILTER collapse %] >+ [% t("Barcode image generator") | html %] › >+ [% t("Cataloging") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% Asset.css("css/humanmsg.css") | $raw %] > [% FILTER collapse %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >index cae46b81a4..75dc6b41aa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >@@ -1,9 +1,20 @@ > [% USE raw %] > [% USE Asset %] > [% USE ItemTypes %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >- <title>[% IF batch_id %]Edit label batch ([% batch_id | html %])[% ELSE %]New label batch[% END %]› Batches › Label creator › Cataloging › Koha</title> >+ <title>[% FILTER collapse %] >+ [% IF ( batch_id ) %] >+ [% tx("Edit label batch {batch_id}", { batch_id = batch_id }) | html %] >+ [% ELSE %] >+ [% t("New label batch") | html %] >+ [% END %] › >+ [% t("Batches") | html %] › >+ [% t("Label creator") | html %] › >+ [% t("Cataloging") | html %] › >+ [% t("Koha") | html %] >+ [% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt >index 6dbf2d8031..a73d2572a6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt >@@ -1,4 +1,5 @@ > [% USE raw %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [%- BLOCK translate_label_types -%] > [%- SWITCH type -%] >@@ -10,7 +11,17 @@ > [%- END -%] > [%- END -%] > [% INCLUDE 'doc-head-open.inc' %] >- <title>[% IF ( layout_id ) %]Edit label layout [% layout_id | html %] [% ELSE %] New label layout [% END %] › Layouts › Label creator › Cataloging › Koha</title> >+ <title>[% FILTER collapse %] >+ [% IF( layout_id ) %] >+ [% tx("Edit label layout {layout_id}", { layout_id = layout_id }) | html %] >+ [% ELSE %] >+ [% t("New label layout") | html %] >+ [% END %] › >+ [% t("Layouts") | html %] › >+ [% t("Label creator") | html %] › >+ [% t("Cataloging") | html %] › >+ [% t("Koha") | html %] >+ [% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt >index 9be72df403..5299bd496b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt >@@ -1,7 +1,18 @@ > [% USE raw %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >- <title>[% IF ( profile_id ) %]Edit printer profile [% profile_id | html %] [% ELSE %] New printer profile [% END%] › Profiles › Label creator › Cataloging › Koha</title> >+ <title>[% FILTER collapse %] >+ [% IF( profile_id ) %] >+ [% tx("Edit printer profile {profile_id}", { profile_id = profile_id }) | html %] >+ [% ELSE %] >+ [% t("New printer profile") | html %] >+ [% END%] › >+ [% t("Profiles") | html %] › >+ [% t("Label creator") | html %] › >+ [% t("Cataloging") | html %] › >+ [% t("Koha") | html %] >+ [% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt >index e15fe31d4f..21e5c17914 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt >@@ -1,7 +1,13 @@ > [% USE raw %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >- <title>Print barcode range › Label creator › Cataloging › Koha</title> >+ <title>[% FILTER collapse %] >+ [% t("Print barcode range") | html %] › >+ [% t("Label creator") | html %] › >+ [% t("Cataloging") | html %] › >+ [% t("Koha") | html %] >+ [% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'greybox.inc' %] > </head> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt >index 5ee5b03c7d..40a751b573 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt >@@ -1,7 +1,18 @@ > [% USE raw %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >- <title>[% IF ( template_id ) %]Edit label template [% template_id | html %] [% ELSE %] New label template [% END %] › Templates › Label creator › Cataloging › Koha</title> >+ <title>[% FILTER collapse %] >+ [% IF( template_id ) %] >+ [% tx("Edit label template {template_id}", { template_id = template_id }) | html %] >+ [% ELSE %] >+ [% t("New label template") | html %] >+ [% END %] › >+ [% t("Templates") | html %] › >+ [% t("Label creator") | html %] › >+ [% t("Cataloging") | html %] › >+ [% t("Koha") | html %] >+ [% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt >index 57a77ee233..7147e73dfc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt >@@ -1,8 +1,13 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >- <title>Label creator › Cataloging › Koha</title> >+ <title>[% FILTER collapse %] >+ [% t("Label creator") | html %] › >+ [% t("Cataloging") | html %] › >+ [% t("Koha") | html %] >+ [% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="labels_label-home" class="tools labels"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >index 6819ec064b..d6175f4c46 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >@@ -5,17 +5,22 @@ > [% BLOCK translate_label_element %] > [%- SWITCH element -%] > [%- CASE 'layout' -%][% t('layout') | html %] >-[%- CASE 'Layouts' -%][% t('Layouts') | html %] >+[%- CASE 'Layouts' -%][% t('Label layouts') | html %] > [%- CASE 'template' -%][% t('template') | html %] >-[%- CASE 'Templates' -%][% t('Templates') | html %] >+[%- CASE 'Templates' -%][% t('Label templates') | html %] > [%- CASE 'profile' -%][% t('profile') | html %] >-[%- CASE 'Profiles' -%][% t('Profiles') | html %] >+[%- CASE 'Profiles' -%][% t('Label profiles') | html %] > [%- CASE 'batch' -%][% t('batch') | html %] >-[%- CASE 'Batches' -%][% t('Batches') | html %] >+[%- CASE 'Batches' -%][% t('Label batches') | html %] > [%- END -%] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] >- <title>[% PROCESS translate_label_element element=label_element_title %] › Label creator › Cataloging › Koha</title> >+ <title>[% FILTER collapse %] >+ [% PROCESS translate_label_element element=label_element_title %] › >+ [% t("Label creator") | html %] › >+ [% t("Cataloging") | html %] › >+ [% t("Koha") | html %] >+ [% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -44,7 +49,15 @@ > <main> > > [% INCLUDE 'labels-toolbar.inc' %] >- <h1>Manage labels</h1> >+ [% IF ( label_element == 'layout' ) %] >+ <h2>[% PROCESS translate_label_element element=label_element_title %]</h2> >+ [% ELSIF ( label_element == 'template' ) %] >+ <h2>[% PROCESS translate_label_element element=label_element_title %]</h2> >+ [% ELSIF ( label_element == 'profile' ) %] >+ <h2>[% PROCESS translate_label_element element=label_element_title %]</h2> >+ [% ELSIF ( label_element == 'batch' ) %] >+ <h2>[% PROCESS translate_label_element element=label_element_title %]</h2> >+ [% END %] > > [% IF ( error ) %] > <div class="dialog alert"> >@@ -55,15 +68,6 @@ > <div id="manage-label-layouts" class="page-section"> > [% IF ( table_loop ) %] > <form name="layouts" action="/cgi-bin/koha/label-manage.pl?label_element=[% label_element | html %]"> >- [% IF ( label_element == 'layout' ) %] >- <h2>Currently available layouts</h2> >- [% ELSIF ( label_element == 'template' ) %] >- <h2>Currently available templates</h2> >- [% ELSIF ( label_element == 'profile' ) %] >- <h2>Currently available profiles</h2> >- [% ELSIF ( label_element == 'batch' ) %] >- <h2>Currently available batches</h2> >- [% END %] > > <div class="page-section"> > <table id="labels-table"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt >index 04d910c739..8f930f0fb6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt >@@ -1,7 +1,12 @@ > [% USE raw %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >- <title>Label printing/exporting › Label creator › Tools › Koha</title> >+ <title>[% FILTER collapse %] >+ [% t("Label printing/exporting") | html %] › >+ [% t("Label creator") | html %] › >+ [% t("Tools") | html %] › >+ [% t("Koha") | html %] >+ [% END %]</title> > [% INCLUDE 'doc-head-close.inc' popup => 1 %] > <style>table {border-collapse: separate; border-spacing: 0; border: hidden none;} .header {cursor: auto; background-position: center center; background-repeat: repeat;}</style> > </head> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >index a8d3f3a4a3..e6b44617da 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >@@ -1,4 +1,5 @@ > [% USE raw %] >+[% PROCESS 'i18n.inc' %] > [% BLOCK pagination %] > <nav> > [% IF ( displayprev || displaynext ) %] >@@ -23,7 +24,11 @@ > [% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >- <title>Search results › Barcodes and labels › Koha</title> >+ <title>[% FILTER collapse %] >+ [% t("Search results") | html %] › >+ [% t("Labels") | html %] › >+ [% t("Koha") | html %] >+ [% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt >index edf948b802..940903d509 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt >@@ -1,7 +1,12 @@ > [% SET footerjs = 1 %] >+[% PROCESS 'i18n.inc' %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Labels › Koha</title> >-[% INCLUDE 'doc-head-close.inc' %] >+ <title>[% FILTER collapse %] >+ [% t("Search") | html %] › >+ [% t("Labels") | html %] › >+ [% t("Koha") | html %] >+ [% END %]</title> >+ [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="labels_search" class="tools labels"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt >index 3b400b0e0c..67daabfed2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt >@@ -1,8 +1,14 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] >-[% INCLUDE 'doc-head-open.inc' %]<title>Quick spine label creator › Cataloging › Koha</title> >-[% INCLUDE 'doc-head-close.inc' %] >+[% INCLUDE 'doc-head-open.inc' %] >+ <title>[% FILTER collapse %] >+ [% t("Quick spine label creator") | html %] › >+ [% t("Cataloging") | html %] › >+ [% t("Koha") | html %] >+ [% END %]</title> >+ [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="labels_spinelabel-home" class="tools labels"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt >index 43875f1922..6e2cb06bf3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt >@@ -1,9 +1,14 @@ > [% USE raw %] > [% USE Asset %] > [% USE Branches %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Spine labels › Tools › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("Spine labels") | html %] › >+ [% t("Tools") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' popup => 1 %] > [% Asset.css("css/spinelabel.css") | $raw %] > <style> >-- >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 33916
:
154689
|
155556
|
156731
|
157569
|
157570
|
157571