Attachment 17031 Details for Bug 8942 – [3.10.x] Bug 8942: Translation process breaks javascript (followup 1)

[patch] [3.10.x] Bug 8942: Translation process breaks javascript (followup 1)

3-10-x-Bug-8942-Translation-process-breaks-javascript-fu1.patch (text/plain), 2.63 KB, created by Fridolin Somers on 2013-03-29 14:35:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fridolin Somers

Created: 2013-03-29 14:35:10 UTC

Size: 2.63 KB

patch

obsolete

>From a3ab988277cd6ec2d59e477c2e2e752e2efcecef Mon Sep 17 00:00:00 2001
>From: Fridolyn SOMERS <fridolyn.somers@biblibre.com>
>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 <oleonard@myacpl.org>
>
>Tested all effected functions. No change in functionality.
>Signed-off-by: Mason James <mtj@kohaaloha.com>
>---
> 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&amp;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
>

Actions: View | Diff | Splinter Review

Attachments on bug 8942: 12907 | 12908 | 12935 | 12939 | 13151 | 13756 | 13757 | 13758 | 14336 | 14337 | 14338 | 14934 | 14935 | 14936 | 15021 | 15058 | 15524 | 17030 | 17031 | 17032 | 17033 | 17034 | 17035