From 58f5a73f41b73361821b847e55a663cc0801c998 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc=20V=C3=A9ron?= Date: Fri, 26 May 2017 21:08:27 +0200 Subject: [PATCH] Bug 18684 - Get rid of %%] in translation for currency.tt File add koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt exposes parts of template directives due to html tags inide directives. Fix it using the HtmlTags filter. To verify: - Create a translation for a language 'aa-AA - po file aa-AA-staff-prog.po / translate.koha-community.org for 17.05 contains a line '%%]'%sCurrencies %s To test: - Apply patch on top of Bug 18665 - Recreate translation - Verify that line above is gone - Verify that in staff client currencies administration wors as before Followed test plan and it worked as intended Signed-off-by: Alex Buckley Signed-off-by: Brendan A Gallagher Bug 18684: (followup) Move 2 closing h3 tags to end of previous lines See comment #4 Signed-off-by: Jonathan Druart --- koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt index 3f2c5bfb04..9b7e1062b4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -1,5 +1,6 @@ [% USE KohaDates %] [% USE ColumnsSettings %] +[% USE HtmlTags %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › Currencies & Exchange rates › [% IF op == 'add_form' %][% IF currency %]Modify currency '[% currency.currency %]'[% ELSE %]New currency[% END %][% END %] @@ -52,7 +53,7 @@ <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › <a href="/cgi-bin/koha/admin/currency.pl">Currencies & Exchange rates</a> › [% IF op == 'add_form' %][% IF currency %]Modify currency '[% currency.currency %]'[% ELSE %]New currency[% END %][% END %] -[% IF op == 'delete_confirm' %]Confirm deletion of currency '[% '<span class="ex">' _ currency.currency _ '</span>' %]' +[% IF op == 'delete_confirm' %]Confirm deletion of currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %] [% ELSIF op == 'list' %]Currencies [% END %] </div> @@ -152,7 +153,7 @@ [% IF op =='delete_confirm' %] [% IF nb_of_orders or nb_of_vendors %] <div class="dialog alert"> - <h3>Cannot delete currency '[% '<span class="ex">' _ currency.currency _ '</span>' %]'</h3> + <h3>Cannot delete currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]</h3> <p> [% IF nb_of_orders %] This currency is used by [% nb_of_orders %] orders. @@ -167,7 +168,7 @@ </div> [% ELSE %] <div class="dialog alert"> - <h3>Confirm deletion of currency '[% '<span class="ex">' _ currency.currency _ '</span>' %]'</h3> + <h3>Confirm deletion of currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]</h3> <table> <tr><th>Currency</th> <td>[% currency.currency %]</td> -- 2.39.5