From c60ad74a7c34c9f35a0a8ad463cd66eaa3aec86f Mon Sep 17 00:00:00 2001 From: Mathieu Saby Date: Mon, 21 Oct 2013 19:24:34 +0200 Subject: [PATCH 2] Bug 9780 QA Followup : suppress line feeds in javascript Content-Type: text/plain; charset="utf-8" This patch suppress \n in javascript, in order to keep Pootle quiet. String patch, no need to test I think. But if you want to test, replay the test plan of main patch, and check the messages in javascript alert are displaying the right way. --- .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc index 2c6f350..63b22a4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -39,20 +39,20 @@ } else if (countorders > 0){ [% IF ( CAN_user_acquisition_order_manage ) %] - is_confirmed = confirm( _("Warning: This record is used in")+" "+ countorders + " " +_("order(s). Deleting it could cause serious issues on acquisition module.\nAre you sure you want to delete this record?") ); + is_confirmed = confirm( _("Warning: This record is used in")+" "+ countorders + " " +_("order(s). Deleting it could cause serious issues on acquisition module. Are you sure you want to delete this record?") ); [% ELSE %] - is_confirmed = alert( countorders + " " +_("order(s) are using this record.\nYou need order managing permissions to delete this record.") ); + is_confirmed = alert( countorders + " " +_("order(s) are using this record. You need order managing permissions to delete this record.") ); [% END %] } else if (countdeletedorders > 0){ [% IF ( CAN_user_acquisition_order_manage ) %] - is_confirmed = confirm( countdeletedorders + " " +_("deleted order(s) are using this record.\nAre you sure you want to delete this record?") ); + is_confirmed = confirm( countdeletedorders + " " +_("deleted order(s) are using this record. Are you sure you want to delete this record?") ); [% ELSE %] - is_confirmed = alert( countdeletedorders + " " +_("deleted order(s) are using this record.\nYou need order managing permissions to delete this record.") ); + is_confirmed = alert( countdeletedorders + " " +_("deleted order(s) are using this record. You need order managing permissions to delete this record.") ); [% END %] } else if ( holdcount > 0 ) { - is_confirmed = confirm( holdcount + " " + _("holds(s) for this record.\nAre you sure you want to delete this record?")); + is_confirmed = confirm( holdcount + " " + _("holds(s) for this record. Are you sure you want to delete this record?")); } else { is_confirmed = confirm(_("Are you sure you want to delete this record?")); } -- 1.7.9.5