Bugzilla – Attachment 3761 Details for
Bug 6084
Missing translation markers in javascript alert messages
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Initial patch
0001-Bug-6084-Missing-translation-markers-in-javascript-a.patch (text/plain), 21.31 KB, created by
Tomás Cohen Arazi (tcohen)
on 2011-04-06 17:54:19 UTC
(
hide
)
Description:
Initial patch
Filename:
MIME Type:
Creator:
Tomás Cohen Arazi (tcohen)
Created:
2011-04-06 17:54:19 UTC
Size:
21.31 KB
patch
obsolete
>From 14c61c84dd273ba25cd59f99c9f25eb19178b52b Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@gmail.com> >Date: Wed, 6 Apr 2011 14:43:22 -0300 >Subject: [PATCH 1/2] [Bug 6084] Missing translation markers in javascript alert messages >Content-Type: text/plain; charset="utf-8" > >I ommited commented lines and "if $debug" lines too. >--- > .../prog/en/includes/labels-batches-toolbar.inc | 10 +++++----- > .../en/includes/patroncards-batches-toolbar.inc | 10 +++++----- > .../intranet-tmpl/prog/en/js/xmlControlfield.js | 2 +- > .../prog/en/modules/acqui/neworderempty.tmpl | 4 ++-- > .../prog/en/modules/admin/biblio_framework.tmpl | 2 +- > .../prog/en/modules/admin/cities.tmpl | 2 +- > .../prog/en/modules/admin/stopwords.tmpl | 2 +- > .../prog/en/modules/cataloguing/additem.tmpl | 2 +- > .../modules/cataloguing/value_builder/macles.tmpl | 2 +- > .../prog/en/modules/labels/label-edit-batch.tmpl | 2 +- > .../prog/en/modules/labels/label-manage.tmpl | 8 ++++---- > .../prog/en/modules/offline_circ/process_koc.tmpl | 4 ++-- > .../prog/en/modules/patroncards/image-manage.tmpl | 2 +- > .../prog/en/modules/patroncards/manage.tmpl | 8 ++++---- > .../prog/en/modules/serials/checkexpiration.tmpl | 2 +- > .../prog/en/modules/serials/serials-recieve.tmpl | 2 +- > .../prog/en/modules/tools/cleanborrowers.tmpl | 4 ++-- > .../opac-tmpl/prog/en/modules/opac-review.tmpl | 4 ++-- > 18 files changed, 36 insertions(+), 36 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-batches-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-batches-toolbar.inc >index f3a2006..77ee7d4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-batches-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-batches-toolbar.inc >@@ -22,7 +22,7 @@ > } > } > if (items.length < 1) { >- alert("Please select at least one item to delete."); >+ alert(_("Please select at least one item to delete.")); > return; // no item selected > } > getstr = items.join("&"); >@@ -34,7 +34,7 @@ > // var msg = "Are you sure you want to remove selected item from this batch?" > // } > else { >- alert("Please select at least label to delete."); >+ alert(_("Please select at least label to delete.")); > return; // no item selected > } > var answer = confirm(msg); >@@ -67,7 +67,7 @@ > } > } > if (labels.length < 1) { >- alert("Please select at least one label to export."); >+ alert(_("Please select at least one label to export.")); > return; // no batch selected > } > getstr = labels.join("&"); >@@ -76,7 +76,7 @@ > getstr = document.items.action.value; > } > else { >- alert("Please select at least one label to export."); >+ alert(_("Please select at least one label to export.")); > return; // no batch selected > } > return GB_showCenter('Export Labels', "/cgi-bin/koha/labels/label-print.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->&" + getstr, 700, 800); >@@ -101,7 +101,7 @@ > return(document.items.action.value); > } > }; >- alert("Please select at least one item."); >+ alert(_("Please select at least one item.")); > return (-1); > }; > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-batches-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-batches-toolbar.inc >index 80e552e..237c9aa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-batches-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-batches-toolbar.inc >@@ -22,7 +22,7 @@ > } > } > if (items.length < 1) { >- alert("Please select at least one item to delete."); >+ alert(_("Please select at least one item to delete.")); > return; // no item selected > } > getstr = items.join("&"); >@@ -34,7 +34,7 @@ > // var msg = "Are you sure you want to remove selected item from this batch?" > // } > else { >- alert("Please select at least label to delete."); >+ alert(_("Please select at least label to delete.")); > return; // no item selected > } > var answer = confirm(msg); >@@ -61,7 +61,7 @@ > } > } > if (patroncards.length < 1) { >- alert("Please select at least one card to export."); >+ alert(_("Please select at least one card to export.")); > return; // no batch selected > } > getstr = patroncards.join("&"); >@@ -70,7 +70,7 @@ > getstr = document.items.action.value; > } > else { >- alert("Please select at least one card to export."); >+ alert(_("Please select at least one card to export.")); > return; // no batch selected > } > return GB_showCenter('Export Labels', "/cgi-bin/koha/patroncards/print.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->&" + getstr, 700, 800); >@@ -95,7 +95,7 @@ > return(document.items.action.value); > } > }; >- alert("Please select at least one item."); >+ alert(_("Please select at least one item.")); > return (-1); > }; > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/xmlControlfield.js b/koha-tmpl/intranet-tmpl/prog/en/js/xmlControlfield.js >index dca6e75..5acb5fd 100755 >--- a/koha-tmpl/intranet-tmpl/prog/en/js/xmlControlfield.js >+++ b/koha-tmpl/intranet-tmpl/prog/en/js/xmlControlfield.js >@@ -209,7 +209,7 @@ function changeH4Result(form, h4_result, tr_result, pos, value) > }).responseXML; > if (this.xmlDoc) this.renderTemplate(); > $("*").ajaxError(function(evt, request, settings){ >- alert("AJAX error: receiving data from " + settings.url); >+ alert(_("AJAX error: receiving data from ") + settings.url); > }); > },//loadXmlValues > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl >index d8b34ce..52e9dc7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl >@@ -78,13 +78,13 @@ $(document).ready(function() > // if user decreases the quantity > if($(this).val() < <!-- TMPL_VAR name="quantityrec" -->) > { >- alert("You have deleted item(s) in the order, don't forget to delete it(them) in the catalog"); >+ alert(_("You have deleted item(s) in the order, don't forget to delete it(them) in the catalog")); > return true; > } > else > { > // if user increases the quantity >- alert("You can't add a new item, please create a new order line"); >+ alert(_("You can't add a new item, please create a new order line")); > // and we replace the original value > $(this).val(<!-- TMPL_VAR name="quantityrec" -->) > return false; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl >index 860f57a..8d979e8 100755 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl >@@ -73,7 +73,7 @@ $(document).ready(function() { > > var matches = new RegExp("\\?error_import_export=(.+)$").exec(window.location.search); > if (matches && matches.length > 1) { >- alert("Error importing the framework " + decodeURIComponent(matches[1])); >+ alert(_("Error importing the framework ") + decodeURIComponent(matches[1])); > } > }); > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl >index dbe2612..8b4aaa9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl >@@ -13,7 +13,7 @@ > //<![CDATA[ > function Check(f) { > if (f.city_zipcode.value.length == 0 && f.city_name.value.length == 0 ) { >- alert("City name & zipcode missing"); >+ alert(_("City name & zipcode missing")); > } else{ > document.Aform.submit(); > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl >index 6fc0148..9a63fe6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl >@@ -19,7 +19,7 @@ > } > function Check(f) { > if (f.word.value.length==0) { >- alert("Form not submitted: word missing"); >+ alert(_("Form not submitted: word missing")); > } else { > document.Aform.submit(); > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl >index 6a32740..3cda858 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl >@@ -160,7 +160,7 @@ $(document).ready(function() { > }); > > function set_to_today(id, force) { >- if (! id) { alert("Bad id " + id + " sent to set_to_today()"); return 0; } >+ if (! id) { alert(_("Bad id ") + id + _(" sent to set_to_today()")); return 0; } > if ($("#" + id).val() == '' || $("#" + id).val() == '0000-00-00' || force) { > $("#" + id).val("<!-- TMPL_VAR NAME="today_iso" -->"); > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tmpl >index 161a041..d5f98c4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tmpl >@@ -157,7 +157,7 @@ function add_macles(myvalue) > //for (i=0;i< (mycountMACLESgen - mycountMACLESinit);i++){ > // PluginAddField(myvalue); > //} >- alert("veuillez d'abord creer le nombre de champs necessaires "); >+ alert(_("veuillez d'abord creer le nombre de champs necessaires ")); > } else { > // Pour chaque valeur cochee, ajouter la valeur dans un noeud MACLES. > for (i=0;i<tab.length;i++){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl >index 7ca0d02..cdb3962 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl >@@ -10,7 +10,7 @@ > } > function verifyBarcodes(barcodes) { > if (barcodes.value == '') { >- alert("Please add barcodes using either the direct entry text area or the item search."); >+ alert(_("Please add barcodes using either the direct entry text area or the item search.")); > return false; // not ok > } > else { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tmpl >index 31fcf16..0839814 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tmpl >@@ -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 Labels', "/cgi-bin/koha/labels/label-print.pl?" + getstr, 700, 800); >@@ -64,7 +64,7 @@ > return(document.layouts.action[selected[0]].value); > } > else { >- alert("Please select only one <!-- TMPL_VAR NAME="label_element" --> to " + op + "."); >+ alert(_('Please select only one ')+'<!-- TMPL_VAR NAME="label_element" -->'+_(' to')+op+'.'); > return (-1); > } > } >@@ -73,7 +73,7 @@ > return(document.layouts.action.value); > } > }; >- alert("Please select a <!-- TMPL_VAR NAME="label_element" -->."); >+ alert(_('Please select a ')+'<!-- TMPL_VAR NAME="label_element" -->.'); > return (-1); > }; > //]]> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tmpl >index 960052c..260754c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tmpl >@@ -10,7 +10,7 @@ $(document).ready(function(){ > }); > function CheckUpload(f){ > if(f.fileToUpload.value == ""){ >- alert("Please choose a file to upload"); >+ alert(_("Please choose a file to upload")); > } else { > return ajaxFileUpload() > } >@@ -84,4 +84,4 @@ function CheckForm(f) { > > > </div> >-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" --> >\ No newline at end of file >+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tmpl >index 0872d17..ecf3511 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tmpl >@@ -32,7 +32,7 @@ > else if (document.delete_images.action.checked){ > return {images:"batch_id="+document.delete_images.action.value, image_ids:document.delete_images.action.value}; > }; >- alert("Please select image(s) to " + op + "."); >+ alert(_("Please select image(s) to ") + op + "."); > return (-1); > }; > function showHideLayers(element, time, action) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tmpl >index 08ab466..a35eabd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tmpl >@@ -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 <!-- TMPL_VAR NAME="card_element" --> to " + op + "."); >+ alert(_('Please select only one ')+'<!-- TMPL_VAR NAME="card_element" -->'+_(' to ') + op + '.'); > return (-1); > } > } >@@ -73,7 +73,7 @@ > return(document.layouts.action.value); > } > }; >- alert("Please select a <!-- TMPL_VAR NAME="card_element" -->."); >+ alert(_('Please select a ')+'<!-- TMPL_VAR NAME="card_element" -->.'); > return (-1); > }; > //]]> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl >index a2f78ab..c839562 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl >@@ -13,7 +13,7 @@ > return true; > } > else { >- alert("You must enter a date !"); >+ alert(_("You must enter a date !")); > document.f.date.focus(); > return false; > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl >index b8d7b00..0098596 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl >@@ -306,7 +306,7 @@ function barcode_check(){ > <h3>Note: Subscription is about to expire next issue.</h3> > <script type="text/javascript"> > <!-- >- alert("Subscription is about to expire next issue"); >+ alert(_("Subscription is about to expire next issue")); > //--> > </script> > <!-- /TMPL_IF --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl >index 331ec2c..d9847dd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl >@@ -11,14 +11,14 @@ > function checkForm(form) { > if((form.checkbox[0].checked)){ > if(!(form.date1.value)){ >- alert("please enter a date !"); >+ alert(_("please enter a date !")); > document.form.date1.focus(); > return false; > } > } > if((form.checkbox[1].checked)){ > if(!(form.date2.value)){ >- alert("please enter a date !"); >+ alert(_("please enter a date !")); > document.form.date2.focus(); > return false; > } >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl >index bac63f6..4397ef0 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl >@@ -8,7 +8,7 @@ > $(document).ready(function() { > var inject_old = function(comment) { > <!-- TMPL_IF NAME="reviewid" --> >- <!-- TMPL_IF NAME="cgi_debug" -->alert("injecting OLD comment: " +comment);<!-- /TMPL_IF --> >+ <!-- TMPL_IF NAME="cgi_debug" -->alert(_('injecting OLD comment: ')+comment);<!-- /TMPL_IF --> > parent.opener.$('#c<!-- TMPL_VAR NAME="reviewid" --> p').prev("small").prev("h5").html("Your Edited Comment (preview, pending approval)"); > parent.opener.$('#c<!-- TMPL_VAR NAME="reviewid" --> p').html(comment); > parent.opener.$('#c<!-- TMPL_VAR NAME="reviewid" --> p').append(" <a href=\"#comment\" onclick=\"Dopop(\'/cgi-bin/koha/opac-review.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->&reviewid=<!-- TMPL_VAR NAME="reviewid" -->\');\">Edit<\/a>"); >@@ -16,7 +16,7 @@ > return 1; > }; > var inject_new = function(comment) { >- <!-- TMPL_IF NAME="cgi_debug" -->alert("injecting NEW comment: " +comment);<!-- /TMPL_IF --> >+ <!-- TMPL_IF NAME="cgi_debug" -->alert(_("injecting NEW comment: ") +comment);<!-- /TMPL_IF --> > parent.opener.$('#newcomment').attr("class","yours"); > parent.opener.$('#newcomment').html( > "<h5>Your Comment (preview, pending approval)<\/h5>" + >-- >1.7.1 >
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 6084
:
3761
|
3762
|
3769
|
3770
|
3936