From a3ab988277cd6ec2d59e477c2e2e752e2efcecef Mon Sep 17 00:00:00 2001 From: Fridolyn SOMERS Date: Wed, 28 Nov 2012 16:10:09 +0100 Subject: [PATCH 2/3] Bug 8942: Translation process breaks javascript (followup 1) Signed-off-by: Owen Leonard Tested all effected functions. No change in functionality. Signed-off-by: Mason James --- koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt | 2 +- 2 files changed, 3 insertions(+), 3 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 8b63ee2..0a6f2ec 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -30,7 +30,7 @@ function confirm_deletion() { var count = [% count %]; var is_confirmed; if (count>0){ - is_confirmed= alert(_('There are [ '+ count +' ] item(s) attached to this record \n You must delete all items before deleting this record.')); + is_confirmed= alert(count + " " +_("item(s) are attached to this record.\nYou must delete all items before deleting this record.")); } else{ is_confirmed= confirm(_("Are you sure you want to delete this record? ")); } @@ -50,7 +50,7 @@ function confirm_deletion() { function confirm_items_deletion() { var count = [% count %]; if(count > 0){ - if(confirm(_('Are you sure you want to delete the ' + count + ' attached items? '))){ + if(confirm(_("Are you sure you want to delete the") + " " + count + " " + _("attached items?"))){ window.location="/cgi-bin/koha/cataloguing/additem.pl?op=delallitems&biblionumber=[% biblionumber %]"; }else{ return false; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt index 8c18d5c..3ccd77f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt @@ -113,7 +113,7 @@ $(document).ready(function(){ // We select the whole field and removing non-selected subfields, instead of... // Alerting the user - alert(_('This subfield cannot be added: there is no ' + field + ' field in the destination record.')); + alert(_("This subfield cannot be added: there is no") + " " + field + " " + _("field in the destination record.")); pField.checked = false; } else { -- 1.7.10.4