Bugzilla – Attachment 14934 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]
Bug 8942: Translation process breaks javascript
Bug-8942-Translation-process-breaks-javascript.patch (text/plain), 40.76 KB, created by
Mason James
on 2013-01-30 06:57:25 UTC
(
hide
)
Description:
Bug 8942: Translation process breaks javascript
Filename:
MIME Type:
Creator:
Mason James
Created:
2013-01-30 06:57:25 UTC
Size:
40.76 KB
patch
obsolete
>From 6d33424c0a5eaf0c66bbed6c3e20be94ba4bac43 Mon Sep 17 00:00:00 2001 >From: Fridolyn SOMERS <fridolyn.somers@biblibre.com> >Date: Wed, 28 Nov 2012 15:37:22 +0100 >Subject: [PATCH] Bug 8942: Translation process breaks javascript >Content-Type: text/plain; charset="utf-8" >http://koha-community.org > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> > >I tested most scripts affected by this patch and visually verified >all changes. Functionality is unaffected. >Signed-off-by: Mason James <mtj@kohaaloha.com> >--- > .../intranet-tmpl/prog/en/includes/calendar.inc | 24 ++++++++++---------- > .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 2 +- > .../prog/en/includes/members-toolbar.inc | 4 +- > koha-tmpl/intranet-tmpl/prog/en/js/acq.js | 2 +- > koha-tmpl/intranet-tmpl/prog/en/js/ajax.js | 8 +++--- > .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 10 ++++---- > .../prog/en/modules/acqui/neworderempty.tt | 2 +- > .../prog/en/modules/acqui/orderreceive.tt | 8 ++++++ > .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 4 +- > .../prog/en/modules/admin/biblio_framework.tt | 4 +- > .../en/modules/admin/item_circulation_alerts.tt | 8 +++--- > .../prog/en/modules/cataloguing/merge.tt | 2 +- > .../prog/en/modules/labels/label-manage.tt | 4 +- > .../prog/en/modules/members/moremember.tt | 4 +- > .../prog/en/modules/offline_circ/list.tt | 4 +- > .../prog/en/modules/offline_circ/process_koc.tt | 2 +- > .../prog/en/modules/patroncards/manage.tt | 8 +++--- > .../prog/en/modules/reserve/request.tt | 8 +++--- > .../prog/en/modules/serials/claims.tt | 8 +++--- > .../intranet-tmpl/prog/en/modules/tags/review.tt | 4 +- > .../prog/en/modules/tools/holidays.tt | 8 +++--- > .../prog/en/modules/tools/quotes-upload.tt | 12 +++++----- > .../intranet-tmpl/prog/en/modules/tools/quotes.tt | 10 ++++---- > .../prog/en/modules/tools/stage-marc-import.tt | 2 +- > .../prog/en/modules/tools/upload-images.tt | 2 +- > .../prog/en/modules/virtualshelves/shelves.tt | 6 ++-- > .../prog/en/modules/opac-results-grouped.tt | 4 +- > .../opac-tmpl/prog/en/modules/opac-results.tt | 4 +- > koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt | 2 +- > .../opac-tmpl/prog/en/modules/opac-shelves.tt | 6 ++-- > .../opac-tmpl/prog/en/modules/opac-suggestions.tt | 4 +- > 31 files changed, 94 insertions(+), 86 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >index fc8a1a3..f0552e8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >@@ -25,18 +25,18 @@ function Date_from_syspref(dstring) { > jQueryUI we expose the localization strings in the default configuration */ > jQuery(function($){ > $.datepicker.regional[''] = { >- closeText: _('Done'), >- prevText: _('Prev'), >- nextText: _('Next'), >- currentText: _('Today'), >- monthNames: [_('January'),_('February'),_('March'),_('April'),_('May'),_('June'), >- _('July'),_('August'),_('September'),_('October'),_('November'),_('December')], >- monthNamesShort: [_('Jan'), _('Feb'), _('Mar'), _('Apr'), _('May'), _('Jun'), >- _('Jul'), _('Aug'), _('Sep'), _('Oct'), _('Nov'), _('Dec')], >- dayNames: [_('Sunday'), _('Monday'), _('Tuesday'), _('Wednesday'), _('Thursday'), _('Friday'), _('Saturday')], >- dayNamesShort: [_('Sun'), _('Mon'), _('Tue'), _('Wed'), _('Thu'), _('Fri'), _('Sat')], >- dayNamesMin: [_('Su'),_('Mo'),_('Tu'),_('We'),_('Th'),_('Fr'),_('Sa')], >- weekHeader: _('Wk'), >+ closeText: _("Done"), >+ prevText: _("Prev"), >+ nextText: _("Next"), >+ currentText: _("Today"), >+ monthNames: [_("January"),_("February"),_("March"),_("April"),_("May"),_("June"), >+ _("July"),_("August"),_("September"),_("October"),_("November"),_("December")], >+ monthNamesShort: [_("Jan"), _("Feb"), _("Mar"), _("Apr"), _("May"), _("Jun"), >+ _("Jul"), _("Aug"), _("Sep"), _("Oct"), _("Nov"), _("Dec")], >+ dayNames: [_("Sunday"), _("Monday"), _("Tuesday"), _("Wednesday"), _("Thursday"), _("Friday"), _("Saturday")], >+ dayNamesShort: [_("Sun"), _("Mon"), _("Tue"), _("Wed"), _("Thu"), _("Fri"), _("Sat")], >+ dayNamesMin: [_("Su"),_("Mo"),_("Tu"),_("We"),_("Th"),_("Fr"),_("Sa")], >+ weekHeader: _("Wk"), > dateFormat: '[% IF ( dateformat_us ) %]mm/dd/yy[% ELSIF ( dateformat_metric ) %]dd/mm/yy[% ELSE %]yy-mm-dd[% END %]', > firstDay: [% CalendarFirstDayOfWeek %], > isRTL: [% IF ( bidi ) %]true[% ELSE %]false[% END %], >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..b2c3d60 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >@@ -31,7 +31,7 @@ function confirm_deletion() { > 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.')); > } else{ >- is_confirmed= confirm(_('Are you sure you want to delete this record? ')); >+ is_confirmed= confirm(_("Are you sure you want to delete this record? ")); > } > > if (is_confirmed) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >index 91d179e..bfa923d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >@@ -3,14 +3,14 @@ > //<![CDATA[ > [% IF ( CAN_user_borrowers ) %] > function confirm_deletion() { >- var is_confirmed = window.confirm(_('Are you sure you want to delete this patron? This cannot be undone.')); >+ var is_confirmed = window.confirm(_("Are you sure you want to delete this patron? This cannot be undone.")); > if (is_confirmed) { > window.location='/cgi-bin/koha/members/deletemem.pl?member=[% borrowernumber %]'; > } > } > > [% IF ( is_child ) %]function confirm_updatechild() { >- var is_confirmed = window.confirm(_('Are you sure you want to update this child to an Adult category? This cannot be undone.')); >+ var is_confirmed = window.confirm(_("Are you sure you want to update this child to an Adult category? This cannot be undone.")); > if (is_confirmed) { > window.location='/cgi-bin/koha/members/update-child.pl?op=update&borrowernumber=[% borrowernumber %]&catcode=[% catcode %]&catcode_multi=[% CATCODE_MULTI %]'; > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js >index 0c3ce91..35287ed 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js >+++ b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js >@@ -384,7 +384,7 @@ function closeandprint(bg){ > if(document.location = '/cgi-bin/koha/acqui/basketgroup.pl?op=closeandprint&basketgroupid=' + bg ){ > setTimeout("window.location.reload();",3000); > }else{ >- alert(_('Error downloading the file')); >+ alert(_("Error downloading the file")); > } > } > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/ajax.js b/koha-tmpl/intranet-tmpl/prog/en/js/ajax.js >index 71f8365..968334b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/js/ajax.js >+++ b/koha-tmpl/intranet-tmpl/prog/en/js/ajax.js >@@ -15,24 +15,24 @@ KOHA.AJAX = { > KOHA.xhr = xhr; > if ( !xhr.getResponseHeader( 'content-type' ).match( 'application/json' ) ) { > // Something really failed >- humanMsg.displayAlert( MSG_INTERNAL_SERVER_ERROR ); >+ humanMsg.displayAlert( _("Internal Server Error, please reload the page") ); > return; > } > > var error = eval( '(' + xhr.responseText + ')' ); > > if ( error.type == 'auth' ) { >- humanMsg.displayMsg( MSG_SESSION_TIMED_OUT ); >+ humanMsg.displayMsg( _("You need to log in again, your session has timed out") ); > } > > if ( callback ) { > callback( error ); > } else { >- humanMsg.displayAlert( MSG_DATA_NOT_SAVED ); >+ humanMsg.displayAlert( _("Error; your data might not have been saved") ); > } > }, > MarkRunning: function ( selector, text ) { >- text = text || MSG_LOADING; >+ text = text || _("Loading..."); > $( selector ) > .attr( 'disabled', 'disabled' ) > .each( function () { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >index 3524ecd..386d699 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -36,26 +36,26 @@ > <script type="text/javascript"> > //<![CDATA[ > function confirm_close() { >- var is_confirmed = confirm(_('Are you sure you want to close this basket?')); >+ var is_confirmed = confirm(_("Are you sure you want to close this basket?")); > if (is_confirmed) { > window.location = "[% script_name %]?op=close&basketno=[% basketno %]"; > } > } > function confirm_deletion() { >- var is_confirmed = confirm(_('Are you sure you want to delete this basket?')); >+ var is_confirmed = confirm(_("Are you sure you want to delete this basket?")); > if (is_confirmed) { > window.location = "[% script_name %]?op=delete_confirm&basketno=[% basketno %]&booksellerid=[% booksellerid %]"; > } > } > function confirm_delete_item(ordernumber, biblionumber) { >- var is_confirmed = confirm(_('Are you sure you want to delete this order ?')); >+ var is_confirmed = confirm(_("Are you sure you want to delete this order ?")); > if (is_confirmed) { > window.location = "addorder.pl?ordernumber="+ordernumber+"&basketno=[% basketno %]&quantity=0&biblionumber="+biblionumber; > } > } > > function confirm_delete_biblio(ordernumber, biblionumber) { >- var is_confirmed = confirm(_('Are you sure you want to delete this catalog record and order ?')); >+ var is_confirmed = confirm(_("Are you sure you want to delete this catalog record and order ?")); > if (is_confirmed) { > window.location = "addorder.pl?ordernumber="+ordernumber+"&basketno=[% basketno %]&quantity=0&biblionumber="+biblionumber+"&delbiblio=1"; > } >@@ -79,7 +79,7 @@ > <script type="text/javascript"> > //<![CDATA[ > function confirm_reopen(skip) { >- var is_confirmed = skip || confirm(_('Are you sure you want to reopen this basket?')); >+ var is_confirmed = skip || confirm(_("Are you sure you want to reopen this basket?")); > if (is_confirmed) { > window.location = "[% script_name %]?op=reopen&basketno=[% basketno %]"; > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >index 398a568..5cb6357 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >@@ -90,7 +90,7 @@ function Check(ff) { > > [% IF (AcqCreateItemOrdering) %] > if(check_additem('[% UniqueItemFields %]') == false) { >- alert(_('Duplicate values detected. Please correct the errors and resubmit.') ); >+ alert(_("Duplicate values detected. Please correct the errors and resubmit.") ); > if(tobedeleted) { > $(lastitemblock).appendTo('#outeritemblock'); > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >index e88f9ce..7ae9a01 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -62,6 +62,14 @@ function IEEventHandler_KeyDown() { > if(tobedeleted){ > $(lastitemblock).remove(); > } >+ >+ if(check_additem('[% UniqueItemFields %]') == false){ >+ alert(_("Duplicate values detected. Please correct the errors and resubmit.") ); >+ if(tobedeleted) { >+ $(lastitemblock).appendTo("#outeritemblock"); >+ } >+ return false; >+ }; > [% END %] > > return true; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index 1fbcc07..fae8473 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -78,14 +78,14 @@ > <script type="text/javascript"> > //<![CDATA[ > function confirm_delete_item(ordernumber, basketno, biblionumber) { >- var is_confirmed = confirm(_('Are you sure you want to delete this order ?')); >+ var is_confirmed = confirm(_("Are you sure you want to delete this order ?")); > if (is_confirmed) { > window.location = "addorder.pl?ordernumber="+ordernumber+"&basketno="+basketno+"&quantity=0&biblionumber="+biblionumber+"&invoiceid=[% invoiceid %]"; > } > } > > function confirm_delete_biblio(ordernumber, basketno, biblionumber) { >- var is_confirmed = confirm(_('Are you sure you want to delete this catalog record and order ?')); >+ var is_confirmed = confirm(_("Are you sure you want to delete this catalog record and order ?")); > if (is_confirmed) { > window.location = "addorder.pl?ordernumber="+ordernumber+"&basketno="+basketno+"&quantity=0&biblionumber="+biblionumber+"&delbiblio=1&invoiceid=[% invoiceid %]"; > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >index eb826a4..6b7df81 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >@@ -82,7 +82,7 @@ $(document).ready(function() { > var filename = $(this).val(); > if ( ! /(?:\.csv|\.sql|\.ods|\.xml)$/.test(filename)) { > $(this).css("background-color","yellow"); >- alert(_('Please select an ods or xml file')); >+ alert(_("Please select an ods or xml file")); > $(this).val(""); > $(this).css("background-color","white"); > } >@@ -110,7 +110,7 @@ $(document).ready(function() { > return false; > } > obj.css("background-color","yellow"); >- alert(_('Please select an spreadsheet (csv, ods, xml) or sql file')); >+ alert(_("Please select an spreadsheet (csv, ods, xml) or sql file")); > obj.val(""); > obj.css("background-color","white"); > return false; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt >index 875ff1b..d4efbef 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt >@@ -42,10 +42,10 @@ var $branch = "[% branch %]"; > $(function(){ > $('#alerttabs').tabs(); > >- var blocked = _('Blocked!'); >- var saving = _('Saving...'); >- var disabledForAll = _('Disabled for all'); >- var disabledForCurrent = _('Disabled for') + ' ' + $branch; >+ var blocked = _("Blocked!"); >+ var saving = _("Saving..."); >+ var disabledForAll = _("Disabled for all"); >+ var disabledForCurrent = _("Disabled for") + ' ' + $branch; > > $('#branch_selector input:submit').hide(); > $('#branch').change(function(){ >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..8c18d5c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >@@ -73,7 +73,7 @@ $(document).ready(function(){ > } > // If the field is not repeatable, we check if it already exists in the result table > if (canbeadded == false) { >- alert(_('The field is non-repeatable and already exists in the destination record. Therefore, you cannot add it.')); >+ alert(_("The field is non-repeatable and already exists in the destination record. Therefore, you cannot add it.")); > pField.checked = 0; > } else { > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >index cd5abcf..db76c12 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >@@ -64,7 +64,7 @@ > return(document.layouts.action[selected[0]].value); > } > else { >- alert(_('Please select only one ')+'[% label_element %]'+_(' to')+op+'.'); >+ alert(_("Please select only one ")+"[% label_element %]"+_(" to")+op+"."); > return (-1); > } > } >@@ -73,7 +73,7 @@ > return(document.layouts.action.value); > } > }; >- alert(_('Please select a ')+'[% label_element %].'); >+ alert(_("Please select a ")+"[% label_element %]."); > return (-1); > }; > //]]> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >index bbb5cab..39f3e55 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -39,14 +39,14 @@ $(document).ready(function() { > [% IF ( picture ) %] > // new YAHOO.widget.Button("delpicture"); // FIXME: formatting mismatch between YUI and normal button > $('#delpicture').click(function(){ >- return confirm(_('Are you sure you want to delete this patron image? This cannot be undone.')); >+ return confirm(_("Are you sure you want to delete this patron image? This cannot be undone.")); > }); > $('#manage-patron-image').find("input[value*=Upload]").click(function(){ > if($("#uploadfile").val() == ""){ > alert(_("Please choose a file to upload")); > return false; > } >- return confirm(_('Are you sure you want to replace the current patron image? This cannot be undone.')); >+ return confirm(_("Are you sure you want to replace the current patron image? This cannot be undone.")); > });[% END %] > $("#renew_all" ).click(function(){ $(".checkboxed").checkCheckboxes(":input[name*=items]" ); $(".checkboxed").unCheckCheckboxes(":input[name*=barcodes]"); }); > $("#CheckAllitems" ).click(function(){ $(".checkboxed").checkCheckboxes(":input[name*=items]" ); $(".checkboxed").unCheckCheckboxes(":input[name*=barcodes]"); return false; }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >index d22cf5f..40c3446 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >@@ -7,8 +7,8 @@ > //<![CDATA[ > $(document).ready(function() { > >- $("span.clearall").html("<a id=\"CheckNone\" href=\"/cgi-bin/koha/offline_circ/list.pl\">"+_('Uncheck all')+"<\/a>"); >- $("span.checkall").html("<a id=\"CheckAll\" href=\"/cgi-bin/koha/offline_circ/list.pl\">"+_('Check all')+"<\/a>"); >+ $("span.clearall").html("<a id=\"CheckNone\" href=\"/cgi-bin/koha/offline_circ/list.pl\">"+_("Uncheck all")+"<\/a>"); >+ $("span.checkall").html("<a id=\"CheckAll\" href=\"/cgi-bin/koha/offline_circ/list.pl\">"+_("Check all")+"<\/a>"); > $('#CheckNone').click(function() { > $("#operations").unCheckCheckboxes(); > return false; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >index b818039..0aae78b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >@@ -18,7 +18,7 @@ function CheckUpload(f){ > } > function CheckForm(f) { > if (f.uploadedfileid.value == '') { >- alert(_('Please upload a file first.')); >+ alert(_("Please upload a file first.")); > } else { > $("#fileuploadstatus").hide(); > $("#fileuploadform").slideUp(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt >index 13f4dc2..afb466b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt >@@ -38,7 +38,7 @@ > } > } > if (batches.length < 1) { >- alert(_('Please select at least one batch to export.')); >+ alert(_("Please select at least one batch to export.")); > return; // no batch selected > } > getstr = batches.join("&"); >@@ -47,7 +47,7 @@ > getstr = "batch_id="+document.layouts.action.value; > } > else { >- alert(_('Please select at least one batch to export.')); >+ alert(_("Please select at least one batch to export.")); > return; // no batch selected > } > return GB_showCenter('Export Patron Cards', "/cgi-bin/koha/patroncards/print.pl?" + getstr, 700, 800); >@@ -64,7 +64,7 @@ > return(document.layouts.action[selected[0]].value); > } > else { >- alert(_('Please select only one ')+'[% card_element %]'+_(' to ') + op + '.'); >+ alert(_("Please select only one ")+"[% card_element %]"+_(" to ") + op + "."); > return (-1); > } > } >@@ -73,7 +73,7 @@ > return(document.layouts.action.value); > } > }; >- alert(_('Please select a ')+'[% card_element %].'); >+ alert(_("Please select a ")+"[% card_element %]."); > return (-1); > }; > //]]> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >index 05470eb..e9a5914 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -97,16 +97,16 @@ function checkMultiHold() { > var msg = ''; > > switch (override_items[itemnumber].holdallowed) { >- case 0: msg = _( 'This item normally cannot be put on hold.' ); break; >- case 1: msg = _( 'This item normally cannot be put on hold except for patrons from ' ) + override_items[itemnumber].homebranch + '.'; break; >+ case 0: msg = _("This item normally cannot be put on hold."); break; >+ case 1: msg = _("This item normally cannot be put on hold except for patrons from ") + override_items[itemnumber].homebranch + "."; break; > } > >- msg += "\n\n" + _( 'Place hold on this item?' ); >+ msg += "\n\n" + _("Place hold on this item?"); > > return confirm(msg); > }); > $("input.warning").click(function() { >- return confirm( _( 'None of these items can normally be put on hold for this patron.' ) + "\n\n" + _( 'Place hold?' ) ); >+ return confirm( _("None of these items can normally be put on hold for this patron.") + "\n\n" + _("Place hold?") ); > }); > $("#requestany").click(function() { > if(this.checked){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >index c1f3aa1..61b19a8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >@@ -38,7 +38,7 @@ > var selected = $("input:checked"); > > if (selected.length == 0) { >- alert(_('Please select at least one item to export.')); >+ alert(_("Please select at least one item to export.")); > return false; > } > >@@ -64,7 +64,7 @@ > // Checks if the form can be sent (at least one checkbox must be checked) > function checkForm() { > if ($("input:checked").length == 0) { >- alert(_('Please select at least one item.')); >+ alert(_("Please select at least one item.")); > return false; > } > } >@@ -97,13 +97,13 @@ > > // Checks if the beginning date is valid > if (!parseInt(beginDate)) { >- alert(_('The beginning date is missing or invalid.')); >+ alert(_("The beginning date is missing or invalid.")); > return false; > } > > // Checks if the ending date is valid > if (!parseInt(endDate)) { >- alert(_('The ending date is missing or invalid.')); >+ alert(_("The ending date is missing or invalid.")); > return false; > } > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >index 4569525..e4af5b0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >@@ -48,13 +48,13 @@ td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > } > } > var success_approve = function(tag){ >- // window.alert(_('AJAX approved tag: ') + tag); >+ // window.alert(_("AJAX approved tag: ") + tag); > }; > var failure_approve = function(tag){ > window.alert(_("AJAX failed to approve tag: ") + tag); > }; > var success_reject = function(tag){ >- // window.alert(_('AJAX rejected tag: ') + tag); >+ // window.alert(_("AJAX rejected tag: ") + tag); > }; > var failure_reject = function(tag){ > window.alert(_("AJAX failed to reject tag: ") + tag); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >index fa7904f..a9e0c96 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >@@ -56,16 +56,16 @@ > $('#showHolidayType').val(holidayType); > > if (holidayType == 'exception') { >- $("#showOperationDelLabel").html(_('Delete this exception.')); >+ $("#showOperationDelLabel").html(_("Delete this exception.")); > $("#holtype").attr("class","key exception").html(_("Holiday exception")); > } else if(holidayType == 'weekday') { >- $("#showOperationDelLabel").html(_('Delete this holiday.')); >+ $("#showOperationDelLabel").html(_("Delete this holiday.")); > $("#holtype").attr("class","key repeatableweekly").html(_("Holiday repeating weekly")); > } else if(holidayType == 'daymonth') { >- $("#showOperationDelLabel").html(_('Delete this holiday.')); >+ $("#showOperationDelLabel").html(_("Delete this holiday.")); > $("#holtype").attr("class","key repeatableyearly").html(_("Holiday repeating yearly")); > } else { >- $("#showOperationDelLabel").html(_('Delete this holiday.')); >+ $("#showOperationDelLabel").html(_("Delete this holiday.")); > $("#holtype").attr("class","key holiday").html(_("Unique holiday")); > } > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt >index 2330ee6..19833a6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt >@@ -237,12 +237,12 @@ > var fileSizeInK = Math.round(evt.target.files[0].size/1024); > > if (!fileType.match(/comma-separated-values|csv|excel/i)) { >- alert(_('Uploads limited to csv. Incorrect filetype: ')+fileType); >+ alert(_("Uploads limited to csv. Incorrect filetype: ")+fileType); > parent.location='quotes-upload.pl'; > return; > } > if (fileSizeInK > 512) { >- if (!confirm(evt.target.files[0].name+' '+fileSizeInK+_(' KB Do you really want to upload this file?'))) { >+ if (!confirm(evt.target.files[0].name+' '+fileSizeInK+_(" KB Do you really want to upload this file?"))) { > parent.location='quotes-upload.pl'; > return; > } >@@ -268,11 +268,11 @@ > success : function(){ > var response = JSON.parse(jqXHR.responseText); > if (response.success) { >- alert(response.records+_(' quotes saved.')); >+ alert(response.records+_(" quotes saved.")); > window.location.reload(true); // is this the best route? > } > else { >- alert(response.records+_(' quotes saved, but an error has occurred. Please ask your administrator to check the server log for more details.')); >+ alert(response.records+_(" quotes saved, but an error has occurred. Please ask your administrator to check the server log for more details.")); > window.location.reload(true); // is this the best route? > } > }, >@@ -284,9 +284,9 @@ > return this.id; > }).get().join(', '); > if (!idsToDelete) { >- alert(_('Please select a quote(s) by clicking the quote id(s) you desire to delete.')); >+ alert(_("Please select a quote(s) by clicking the quote id(s) you desire to delete.")); > } >- else if (confirm(_('Are you sure you wish to delete quote(s) ')+idsToDelete+'?')) { >+ else if (confirm(_("Are you sure you wish to delete quote(s) ")+idsToDelete+"?")) { > oTable.$('.selected').each(function(){ > oTable.fnDeleteRow(this); > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >index ea5769c..a16c51a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >@@ -11,7 +11,7 @@ > <script type="text/javascript"> > //<![CDATA[ > var oTable; /* oTable needs to be global */ >- var sEmptyTable = _('No quotes available. Please use the "Add quote" button to add a quote.'); /* override the default message in datatables-strings.inc */ >+ var sEmptyTable = _("No quotes available. Please use the \"Add quote\" button to add a quote."); /* override the default message in datatables-strings.inc */ > $(document).ready(function() { > /* NOTE: This is an ajax-source datatable and *not* a server-side sourced datatable. */ > /* See the datatable docs if you don't understand this difference. */ >@@ -116,11 +116,11 @@ > }); > } > else { >- alert(_('Please supply both the text and source of the quote before saving.')); >+ alert(_("Please supply both the text and source of the quote before saving.")); > } > } > else if (e.keyCode == 27) { >- if (confirm(_('Are you sure you want to cancel adding this quote?'))) { >+ if (confirm(_("Are you sure you want to cancel adding this quote?"))) { > oTable.fnDeleteRow(node); > } > else { >@@ -149,9 +149,9 @@ > return this.id; > }).get().join(', '); > if (!idsToDelete) { >- alert(_('Please select a quote(s) by clicking the quote id(s) you desire to delete.')); >+ alert(_("Please select a quote(s) by clicking the quote id(s) you desire to delete.")); > } >- else if (confirm(_('Are you sure you wish to delete quote(s) ')+idsToDelete+'?')) { >+ else if (confirm(_("Are you sure you wish to delete quote(s) ")+idsToDelete+"?")) { > oTable.$('.selected').each(function(){ > var quoteID = $(this).attr('id'); > $.ajax({ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >index 4846872..6a8695b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >@@ -21,7 +21,7 @@ $(document).ready(function(){ > }); > function CheckForm(f) { > if ($("#fileToUpload").value == '') { >- alert(_('Please upload a file first.')); >+ alert(_("Please upload a file first.")); > } else { > return submitBackgroundJob(f); > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >index 5508e87..5c02e9c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >@@ -20,7 +20,7 @@ $(document).ready(function(){ > }); > function CheckForm(f) { > if ($("#fileToUpload").value == '') { >- alert(_('Please upload a file first.')); >+ alert(_("Please upload a file first.")); > } else { > return submitBackgroundJob(f); > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >index 81fe513..c3fa943 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -9,8 +9,8 @@ var MSG_NO_ITEM_SELECTED = _("Nothing is selected."); > > $(document).ready(function(){ > $("#addbarcode").focus(); >- $("span.clearall").html("<a id=\"CheckNone\" href=\"/cgi-bin/koha/shelves.pl\">"+_('Clear all')+"<\/a>"); >- $("span.checkall").html("<a id=\"CheckAll\" href=\"/cgi-bin/koha/shelves.pl\">"+_('Select all')+"<\/a>"); >+ $("span.clearall").html("<a id=\"CheckNone\" href=\"/cgi-bin/koha/shelves.pl\">"+_("Clear all")+"<\/a>"); >+ $("span.checkall").html("<a id=\"CheckAll\" href=\"/cgi-bin/koha/shelves.pl\">"+_("Select all")+"<\/a>"); > $("#CheckAll").click(function(){ > $(".checkboxed").checkCheckboxes(); > return false; >@@ -37,7 +37,7 @@ $(document).ready(function(){ > var checkboxes = $("input:checkbox:checked"); > var nbCheckbox = checkboxes.length; > if (nbCheckbox != 2) { >- alert(_('Two records must be selected for merging.')); >+ alert(_("Two records must be selected for merging.")); > } else { > location.href='/cgi-bin/koha/cataloguing/merge.pl?biblionumber=' + checkboxes[0].value + '&biblionumber=' + checkboxes[1].value; > } >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt >index 222d841..a461800 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt >@@ -40,12 +40,12 @@ $(document).ready(function(){ > var shelfnumber = $("#addto").find("option:selected").attr("id").replace("s",""); > [% IF ( loggedinusername ) %]if (vShelfAdd()) { > Dopop('/cgi-bin/koha/opac-addbybiblionumber.pl?selectedshelf='+shelfnumber+'&' + vShelfAdd()); >- }[% ELSE %] alert(_('You must be logged in to create or add to Lists')); [% END %] >+ }[% ELSE %] alert(_("You must be logged in to create or add to Lists")); [% END %] > return false; > } else if($("#addto").find("option:selected").attr("value") == "newlist"){ > [% IF ( loggedinusername ) %]if (vShelfAdd()) { > Dopop('/cgi-bin/koha/opac-addbybiblionumber.pl?newshelf=1&' + vShelfAdd()); >- }[% ELSE %] alert(_('You must be logged in to create or add to Lists')); [% END %] >+ }[% ELSE %] alert(_("You must be logged in to create or add to Lists")); [% END %] > return false; > } > if($("#addto").find("option:selected").attr("value") == "addtocart"){ >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt >index 89cc5db..bd7d04d 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt >@@ -178,12 +178,12 @@ $(document).ready(function(){ > } else if($("#addto").find("option:selected").attr("value") == "newlist"){ > [% IF ( loggedinusername ) %]if (vShelfAdd()) { > Dopop('/cgi-bin/koha/opac-addbybiblionumber.pl?newshelf=1&' + vShelfAdd()); >- }[% ELSE %] alert(_('You must be logged in to create or add to lists')); [% END %] >+ }[% ELSE %] alert(_("You must be logged in to create or add to lists")); [% END %] > return false; > } else if($("#addto").find("option:selected").attr("value") == "morelists"){ > [% IF ( loggedinusername ) %]if (vShelfAdd()) { > Dopop('/cgi-bin/koha/opac-addbybiblionumber.pl?' + vShelfAdd()); >- }[% ELSE %] alert(_('You must be logged in to create or add to lists')); [% END %] >+ }[% ELSE %] alert(_("You must be logged in to create or add to lists")); [% END %] > return false; > } > if($("#addto").find("option:selected").attr("value") == "addtocart" || $("#addto").attr("class") == "addtocart"){ >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt >index 5ab225d..bdf499f 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt >@@ -8,7 +8,7 @@ > $(document).ready(function() { > var inject_old = function(comment) { > [% IF ( reviewid ) %] >- [% IF ( cgi_debug ) %]alert(_('injecting OLD comment: ')+comment);[% END %] >+ [% IF ( cgi_debug ) %]alert(_("injecting OLD comment: ")+comment);[% END %] > parent.opener.$('#c[% reviewid %] p').prev("small").prev("h5").html(_("Your edited comment (preview, pending approval)")); > parent.opener.$('#c[% reviewid %] p').html(comment); > parent.opener.$('#c[% reviewid %] p').append(" <a href=\"#comment\" onclick=\"Dopop(\'/cgi-bin/koha/opac-review.pl?biblionumber=[% biblionumber | uri %]&reviewid=[% reviewid | uri%]\');\">"+_("Edit")+"<\/a>"); >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt >index 8f31917..d6c1ed5 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt >@@ -82,11 +82,11 @@ function enableCheckboxActions(){ > > $(function() { > [% IF ( opacbookbag ) %]$(".addtocart").show();[% END %] >- $("span.clearall").html("<a id=\"CheckNone\" href=\"#\">"+_('Clear all')+"<\/a>"); >- $("span.checkall").html("<a id=\"CheckAll\" href=\"#\">"+_('Select all')+"<\/a>"); >+ $("span.clearall").html("<a id=\"CheckNone\" href=\"#\">"+_("Clear all")+"<\/a>"); >+ $("span.checkall").html("<a id=\"CheckAll\" href=\"#\">"+_("Select all")+"<\/a>"); > $("a.print").show(); > >- [% IF ( opacuserlogin ) %][% IF ( RequestOnOpac ) %]$("#placehold").html("<a href=\"#\" class=\"hold tag_hides disabled\">"+_('Place hold')+"<\/a>"); >+ [% IF ( opacuserlogin ) %][% IF ( RequestOnOpac ) %]$("#placehold").html("<a href=\"#\" class=\"hold tag_hides disabled\">"+_("Place hold")+"<\/a>"); > $("#selections-toolbar a.hold").click(function(){ > holdSelections(); > return false; >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt >index 3c62e55..cbf7aaf 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt >@@ -44,8 +44,8 @@ $.tablesorter.addParser({ > [% END %] > } > }); >- [% IF ( loggedinusername ) %]$("span.clearall").html("<a id=\"CheckNone\" href=\"#\">"+_('Clear all')+"<\/a>"); >- $("span.checkall").html("<a id=\"CheckAll\" href=\"#\">"+_('Select all')+"<\/a>"); >+ [% IF ( loggedinusername ) %]$("span.clearall").html("<a id=\"CheckNone\" href=\"#\">"+_("Clear all")+"<\/a>"); >+ $("span.checkall").html("<a id=\"CheckAll\" href=\"#\">"+_("Select all")+"<\/a>"); > $("#CheckAll").click(function(){ > $(".checkboxed").checkCheckboxes(); > enableCheckboxActions(); >-- >1.7.2.5
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=14934">View the attachment on a separate page</a>.</b>
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