Bugzilla – Attachment 147275 Details for
Bug 33000
Use template wrapper for breadcrumbs: Acquisitions part 1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33000: (follow-up) Add spans for translatability
Bug-33000-follow-up-Add-spans-for-translatability.patch (text/plain), 10.60 KB, created by
Owen Leonard
on 2023-02-23 22:32:08 UTC
(
hide
)
Description:
Bug 33000: (follow-up) Add spans for translatability
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2023-02-23 22:32:08 UTC
Size:
10.60 KB
patch
obsolete
>From 3161aae9cf1c46b0f0ffa9c5daa6fa1e141910c9 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 23 Feb 2023 22:29:16 +0000 >Subject: [PATCH] Bug 33000: (follow-up) Add spans for translatability > >This patch finds places in the updated breadcrumbs markup where a >translatable string is isolated in a way that makes it hard for the >translation script to find it, and wraps these strings with <span> > >This follow-up includes a change to admin/cities.tt as well. >--- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt | 2 +- > .../intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 6 +++--- > .../intranet-tmpl/prog/en/modules/acqui/basketgroup.tt | 4 ++-- > .../intranet-tmpl/prog/en/modules/acqui/basketheader.tt | 4 ++-- > .../intranet-tmpl/prog/en/modules/acqui/booksellers.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/acqui/cancelorder.tt | 2 +- > .../intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt | 2 +- > .../intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt | 4 ++-- > 12 files changed, 18 insertions(+), 17 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >index a3b08063c6d..6fa7008a908 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >@@ -18,7 +18,7 @@ > [% WRAPPER 'sub-header.inc' %] > [% WRAPPER breadcrumbs %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- Acquisitions >+ <span>Acquisitions</span> > [% END %] > [% END #/ WRAPPER breadcrumbs %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >index c1a4ce080af..87add6951c2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -43,7 +43,7 @@ > <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a> > [% END %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- Add orders from MARC file >+ <span>Add orders from MARC file</span> > [% END %] > [% END #/ WRAPPER breadcrumbs %] > [% END #/ WRAPPER sub-header.inc %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >index 12a910fc8b6..3b49e6193a2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -51,11 +51,11 @@ > <span>New</span> > [% END %] > [% END %] >- <span>Basket [% basketname | html %] > [% IF ( basketno ) %] >- ([% basketno | html %]) >+ <span>Basket [% basketname | html %] ([% basketno | html %]) for [% booksellername | html %]</span> >+ [% ELSE %] >+ <span>Basket [% basketname | html %] for [% booksellername | html %]</span> > [% END %] >- for [% booksellername | html %]</span> > [% END %] > [% END #/ WRAPPER breadcrumbs %] > [% END #/ WRAPPER sub-header.inc %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >index 2f0cf13b7e3..1000d66fddd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >@@ -103,14 +103,14 @@ > <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]">Basket grouping</a> > [% END %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- Add basket group for [% booksellername | html %] >+ <span>Add basket group for [% booksellername | html %]</span> > [% END %] > [% ELSE %] > [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a> > [% END %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- Basket grouping >+ <span>Basket grouping</span> > [% END %] > [% END # /IF grouping %] > [% END #/ WRAPPER breadcrumbs %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >index 928c313c56e..88dd4cb3545 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >@@ -30,11 +30,11 @@ > [% IF ( add_form ) %] > [% IF ( basketno ) %] > [% WRAPPER breadcrumb_item bc_active= 1%] >- Edit basket '[% basketname | html %]' >+ <span>Edit basket '[% basketname | html %]'</span> > [% END %] > [% ELSE %] > [% WRAPPER breadcrumb_item bc_active= 1%] >- Add a basket to [% booksellername | html %] >+ <span>Add a basket to [% booksellername | html %]</span> > [% END %] > [% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >index d3539629ef3..1297f7b423a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >@@ -4,6 +4,7 @@ > [% USE Asset %] > [% USE AuthorisedValues %] > [% USE KohaDates %] >+[% USE HtmlTags %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Search for vendor [% supplier | html %] › Koha</title> >@@ -26,7 +27,7 @@ > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> > [% END %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- Search for vendor <em>[% supplier | html %]</em> >+ <span>Search for vendor [% supplier | $HtmlTags tag='em' %]</span> > [% END %] > [% END #/ WRAPPER breadcrumbs %] > [% END #/ WRAPPER sub-header.inc %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt >index e0138d0f10a..65899cc0acf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt >@@ -19,7 +19,7 @@ > <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]">Basket [% basket.basketname | html %] ([% basket.basketno | html %]) for [% basket.bookseller.name | html %]</a> > [% END %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- Cancel order >+ <span>Cancel order</span> > [% END %] > [% END #/ WRAPPER breadcrumbs %] > [% END #/ WRAPPER sub-header.inc %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt >index e065d4c42aa..9997b9b7653 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt >@@ -35,7 +35,7 @@ Acquisitions › Koha > <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]">Basket [% basket.basketno | html %]</a> > [% END %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- Duplicate existing orders >+ <span>Duplicate existing orders</span> > [% END %] > [% END # /UNLESS blocking_error %] > [% END #/ WRAPPER breadcrumbs %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt >index 58cef5c881e..6423e209684 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt >@@ -15,7 +15,7 @@ > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> > [% END %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- Basket ([% basketno | html %]) >+ <span>Basket ([% basketno | html %])</span> > [% END %] > [% END #/ WRAPPER breadcrumbs %] > [% END #/ WRAPPER sub-header.inc %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >index 5276981a1f0..6b6f8900d11 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >@@ -21,7 +21,7 @@ > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> > [% END %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- EDIFACT messages >+ <span>EDIFACT messages</span> > [% END %] > [% END #/ WRAPPER breadcrumbs %] > [% END #/ WRAPPER sub-header.inc %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt >index b139930adcd..05c7a165f51 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt >@@ -14,7 +14,7 @@ > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> > [% END %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- EDIFACT messages >+ <span>EDIFACT messages</span> > [% END %] > [% END #/ WRAPPER breadcrumbs %] > [% END #/ WRAPPER sub-header.inc %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >index 98235c8215b..d34ba5e63a8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >@@ -46,12 +46,12 @@ > <a href="/cgi-bin/koha/admin/cities.pl">Cities</a> > [% END %] > [% WRAPPER breadcrumb_item bc_active = 1 %] >- Confirm deletion of city >+ <span>Confirm deletion of city</span> > [% END %] > > [% ELSE %] > [% WRAPPER breadcrumb_item bc_active = 1 %] >- Cities >+ <span>Cities</span> > [% END %] > [% END #/IF op = add_form %] > >-- >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 33000
:
146899
|
147094
|
147275
|
147615
|
147746
|
147747