From ab7faf937e27b04e8be345cdee594518cfe94fa6 Mon Sep 17 00:00:00 2001 From: Fridolyn SOMERS Date: Wed, 28 Nov 2012 15:37:22 +0100 Subject: [PATCH 1/3] Bug 8942: Translation process breaks javascript Signed-off-by: Owen Leonard I tested most scripts affected by this patch and visually verified all changes. Functionality is unaffected. Signed-off-by: Mason James --- koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc | 2 +- koha-tmpl/intranet-tmpl/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 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 10 +++++----- .../intranet-tmpl/prog/en/modules/acqui/neworderempty.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/admin/biblio_framework.tt | 4 ++-- .../prog/en/modules/admin/item_circulation_alerts.tt | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt | 2 +- .../intranet-tmpl/prog/en/modules/labels/label-manage.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/members/moremember.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt | 4 ++-- .../prog/en/modules/offline_circ/process_koc.tt | 2 +- .../intranet-tmpl/prog/en/modules/patroncards/manage.tt | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt | 8 ++++---- .../intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/upload-images.tt | 2 +- .../intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt | 6 +++--- koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt | 4 ++-- koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt | 4 ++-- koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt | 2 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt | 6 +++--- 27 files changed, 62 insertions(+), 62 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 f02b6c6..ac1d594 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -32,7 +32,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 ba664dc..3eebe2a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -3,13 +3,13 @@ // // // ul').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 ab5901a..52000b4 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 ba23bb7..bbba471 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -38,14 +38,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 @@ //"+_('Uncheck all')+"<\/a>"); - $("span.checkall").html(""+_('Check all')+"<\/a>"); + $("span.clearall").html(""+_("Uncheck all")+"<\/a>"); + $("span.checkall").html(""+_("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 a48fa70..40b5ccd 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 399c933..8b36946 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt @@ -37,7 +37,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; } @@ -63,7 +63,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; } } @@ -96,13 +96,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 ddd59d3..d53ee7e 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 6e50425..c4adc90 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt @@ -34,16 +34,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/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt index 478527c..630f560 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 @@ -14,7 +14,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 0a9521d..7cca4d5 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(""+_('Clear all')+"<\/a>"); - $("span.checkall").html(""+_('Select all')+"<\/a>"); + $("span.clearall").html(""+_("Clear all")+"<\/a>"); + $("span.checkall").html(""+_("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 a739d4f..d52f739 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 @@ -34,12 +34,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 ea073ac..f32e2b8 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt @@ -167,12 +167,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 c0c068f..e195da0 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(" "+_("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 11e82f4..9135fff 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt @@ -78,11 +78,11 @@ function enableCheckboxActions(){ $(function() { [% IF ( opacbookbag ) %]$(".addtocart").show();[% END %] - $("span.clearall").html(""+_('Clear all')+"<\/a>"); - $("span.checkall").html(""+_('Select all')+"<\/a>"); + $("span.clearall").html(""+_("Clear all")+"<\/a>"); + $("span.checkall").html(""+_("Select all")+"<\/a>"); $("a.print").show(); - [% IF ( opacuserlogin ) %][% IF ( RequestOnOpac ) %]$("#placehold").html(""+_('Place hold')+"<\/a>"); + [% IF ( opacuserlogin ) %][% IF ( RequestOnOpac ) %]$("#placehold").html(""+_("Place hold")+"<\/a>"); $("#selections-toolbar a.hold").click(function(){ holdSelections(); return false; -- 1.7.10.4