Attachment 136105 Details for Bug 30733 – Bug 30733: Undo some <span> additions that don't yield good strings

[patch] Bug 30733: Undo some <span> additions that don't yield good strings

Bug-30733-Undo-some-span-additions-that-dont-yield.patch (text/plain), 5.14 KB, created by Victor Grousset/tuxayo on 2022-06-15 17:31:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Victor Grousset/tuxayo

Created: 2022-06-15 17:31:43 UTC

Size: 5.14 KB

patch

obsolete

>From 52bce433314d3899371972dfff6eb6a4e018f46a Mon Sep 17 00:00:00 2001
>From: Victor Grousset/tuxayo <victor@tuxayo.net>
>Date: Mon, 13 Jun 2022 04:49:00 +0200
>Subject: [PATCH] Bug 30733: Undo some <span> additions that don't yield good
> strings
>
>They need more complex solutions that would be better in a follow up ticket
>to not drag this one too long.
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt | 4 ++--
> koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt  | 4 ++--
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt    | 4 ++--
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>index 24aa52d375..636406a0d6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>@@ -373,9 +373,9 @@
>                                             [% END %]
>                                         [% ELSIF ( loopro.module == 'RECALLS' ) %]
>                                             [% IF loopro.recall.item_level %]
>-                                                <span>Item-level recall on <a href="/cgi-bin/koha/catalogue/moredetail.pl?item=[% loopro.recall.itemnumber | uri %]&amp;biblionumber=[% loopro.recall.biblionumber | uri %]&amp;bi=[% loopro.recall.item.biblioitemnumber | uri %]">item</a></span>
>+                                                Item-level recall on <a href="/cgi-bin/koha/catalogue/moredetail.pl?item=[% loopro.recall.itemnumber | uri %]&amp;biblionumber=[% loopro.recall.biblionumber | uri %]&amp;bi=[% loopro.recall.item.biblioitemnumber | uri %]">item</a>
>                                             [% ELSE %]
>-                                                <span>Biblio-level recall on</span> <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.recall.biblionumber | uri %]">biblio</a>
>+                                                Biblio-level recall on <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.recall.biblionumber | uri %]">biblio</a>
>                                             [% END %]
>                                         [% ELSE %]
>                                             [% loopro.object | html %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
>index 81a448120b..cec3b0951e 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
>@@ -43,9 +43,9 @@
>                             <p>
>                                 <span>The [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog is offline for system maintenance. We'll be back soon!</span>
>                                 [% IF ( Koha.Preference( 'ReplytoDefault' ) ) %]
>-                                    <span>If you have any questions, please contact the <a href="mailto:[% Koha.Preference( 'ReplytoDefault' ) | $raw %]">site administrator</a></span>
>+                                    If you have any questions, please contact the <a href="mailto:[% Koha.Preference( 'ReplytoDefault' ) | $raw %]">site administrator</a>
>                                 [% ELSIF ( Koha.Preference( 'KohaAdminEmailAddress' ) ) %]
>-                                    <span>If you have any questions, please contact the <a href="mailto:[% Koha.Preference( 'KohaAdminEmailAddress' ) | $raw %]">site administrator</a></span>
>+                                    If you have any questions, please contact the <a href="mailto:[% Koha.Preference( 'KohaAdminEmailAddress' ) | $raw %]">site administrator</a>
>                                 [% END %]
>                             </p>
>                     [% END %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
>index 09e0e51c12..445ec01a03 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
>@@ -124,10 +124,10 @@
>                         [% END # / TAGLOOP%]
>                         [% IF ( add_op ) %]
>                             [% IF ( added_count ) %]
>-                                <div class="dialog message">[% added_count | html %] [% IF ( added_count == 1 ) %]<span>tag</span>[% ELSE %]<span>tags</span>[% END %] <span>successfully added.</span></div>
>+                                <div class="dialog message">[% added_count | html %] [% IF ( added_count == 1 ) %]tag[% ELSE %]tags[% END %] successfully added.</div>
>                             [% END %]
>                             [% IF ( deleted_count ) %]
>-                            <div class="dialog message">[% deleted_count | html %] [% IF ( deleted_count == 1 ) %]<span>tag</span>[% ELSE %]<span>tags</span>[% END %] <span>successfully deleted.</span></div>
>+                                <div class="dialog message">[% deleted_count | html %] [% IF ( deleted_count == 1 ) %]tag[% ELSE %]tags[% END %] successfully deleted.</div>
>                             [% END %]
>                         [% END # /add_op %]
> 
>-- 
>2.36.1

Actions: View | Diff | Splinter Review

Attachments on bug 30733: 134903 | 134908 | 134912 | 135444 | 135564 | 135565 | 135566 | 135567 | 135568 | 135569 | 136012 | 136013 | 136014 | 136015 | 136016 | 136017 | 136018 | 136019 | 136020 | 136021 | 136045 | 136046 | 136047 | 136048 | 136049 | 136050 | 136051 | 136052 | 136053 | 136054 | 136098 | 136099 | 136100 | 136101 | 136102 | 136103 | 136104 | 136105 | 136106 | 136107 | 136108 | 136109 | 136110 | 136111 | 136112 | 136113 | 136114 | 136115 | 136116 | 136117 | 136174 | 136175 | 136176 | 136177 | 136178 | 136179 | 136180 | 136181 | 136182 | 136183 | 136188 | 136189 | 136190 | 136191 | 136192 | 136193 | 136194 | 136195 | 136196 | 136197 | 136202 | 136203 | 136204 | 136205 | 136206 | 136207 | 136208 | 136209 | 136210 | 136211 | 136286