Bugzilla – Attachment 14337 Details for
Bug 8942
Translation process breaks javascript in calendar.inc
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 8942: Translation process breaks javascript (followup 1)
SIGNED-OFF-Bug-8942-Translation-process-breaks-jav.patch (text/plain), 2.61 KB, created by
Owen Leonard
on 2012-12-31 14:35:06 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 8942: Translation process breaks javascript (followup 1)
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2012-12-31 14:35:06 UTC
Size:
2.61 KB
patch
obsolete
>From d04bec3e67a075ef91916c01ef5f9ab621181a8d 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] [SIGNED-OFF] Bug 8942: Translation process breaks javascript > (followup 1) >Content-Type: text/plain; charset="utf-8" > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> > >Tested all effected functions. No change in functionality. >--- > .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 4 ++-- > .../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 f8e6b4a..c71f0d1 100644 >--- 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 a448534..a7637df 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.9.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
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