Bug 8942: Translation process breaks javascript (followup 1)

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested all effected functions. No change in functionality.
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>

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 b2c3d60..77cf8c4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
@@ -29,7 +29,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? "));
        }
@@ -49,7 +49,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 (file)
--- 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 {