From 4f2dba105e45446448f250356b5ec1cb74085dfd Mon Sep 17 00:00:00 2001 From: Hector Castro Date: Thu, 7 Jul 2016 09:13:30 -0600 Subject: [PATCH] Bug 16701: (follow-up) improve some changes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Add missing quote in line 152 Modify title of the page and breadcrumbs section wrong "searchfield" used should be instead "currency.currency" To test -Try to delete the active and used currency, for example, my case USD, look that appear USD' with the initial single quote missing in message Confirm deletion of currency USD' -Notice about the breadcrumbs section appear: Confirm deletion of currency '' Should appear the currency -Try to delete another currency see the pharese look the same -Notice about the title in both cases, there is missing the currency name -Apply follow-up and re-test Sing-off on followup Signed-off-by: Marc Véron Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall --- koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt | 6 +++--- 1 file changed, 3 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 c21468aa0f..90c828ba8d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -3,7 +3,7 @@ [% 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 %] -[% IF op == 'delete_' %]Confirm deletion of currency '[% searchfield %]'[% END %] +[% IF op == 'delete_confirm' %]Confirm deletion of currency '[% currency.currency %]'[% END %] [% IF op == 'list' %]Currencies[% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -49,7 +49,7 @@ @@ -149,7 +149,7 @@ [% IF op =='delete_confirm' %] [% IF nb_of_orders or nb_of_vendors %]
-

Cannot delete currency [% '' _ currency.currency _ '' %]'

+

Cannot delete currency '[% '' _ currency.currency _ '' %]'

[% IF nb_of_orders %] This currency is used by [% nb_of_orders %] orders. -- 2.39.5