Bugzilla – Attachment 3770 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]
Signed off patch 2
0002-SIGNED-OFF-Bug-6084-Follow-up-fix-more-translation-m.patch (text/plain), 7.09 KB, created by
Katrin Fischer
on 2011-04-07 08:49:26 UTC
(
hide
)
Description:
Signed off patch 2
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2011-04-07 08:49:26 UTC
Size:
7.09 KB
patch
obsolete
>From 816e368d4c861164535007c9808296b87bb04cff Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@gmail.com> >Date: Wed, 6 Apr 2011 14:51:12 -0300 >Subject: [PATCH 2/2] [SIGNED-OFF] Bug 6084: Follow up - fix more translation markers >Content-Type: text/plain; charset="utf-8" > >grep -R 'alert("' * > >was not enough. I needed > >grep -R "alert('" > >too!. > >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >--- > .../prog/en/includes/background-job.inc | 2 +- > koha-tmpl/intranet-tmpl/prog/en/js/acq.js | 2 +- > .../prog/en/modules/admin/biblio_framework.tmpl | 4 ++-- > .../prog/en/modules/offline_circ/process_koc.tmpl | 2 +- > .../prog/en/modules/tools/stage-marc-import.tmpl | 2 +- > .../prog/en/modules/opac-results-grouped.tmpl | 4 ++-- > .../opac-tmpl/prog/en/modules/opac-results.tmpl | 4 ++-- > 7 files changed, 10 insertions(+), 10 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc >index 7d65d4d..b18d5ce 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc >@@ -73,7 +73,7 @@ > backgroundJobProgressTimer = setInterval("updateJobProgress()", 500); > }, > error: function(xml, textStatus) { >- alert('Failed to submit form: ' + textStatus); >+ alert(_('Failed to submit form: ') + textStatus); > } > > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js >index 5936359..bcfb7b8 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/modules/admin/biblio_framework.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl >index 8d979e8..c54eef2 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 >@@ -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/offline_circ/process_koc.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tmpl >index 260754c..250f1b9 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 >@@ -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/tools/stage-marc-import.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tmpl >index 8660db0..4553f1a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tmpl >@@ -17,7 +17,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/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl >index 8f87b1b..69a8c48 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl >@@ -34,12 +34,12 @@ $(document).ready(function(){ > var shelfnumber = $("#addto").find("option:selected").attr("id").replace("s",""); > <!-- TMPL_IF NAME="loggedinusername" -->if (vShelfAdd()) { > Dopop('/cgi-bin/koha/opac-addbybiblionumber.pl?selectedshelf='+shelfnumber+'&' + vShelfAdd()); >- }<!-- TMPL_ELSE --> alert('You must be logged in to create or add to Lists'); <!-- /TMPL_IF --> >+ }<!-- TMPL_ELSE --> alert(_('You must be logged in to create or add to Lists')); <!-- /TMPL_IF --> > return false; > } else if($("#addto").find("option:selected").attr("value") == "newlist"){ > <!-- TMPL_IF NAME="loggedinusername" -->if (vShelfAdd()) { > Dopop('/cgi-bin/koha/opac-addbybiblionumber.pl?newshelf=1&' + vShelfAdd()); >- }<!-- TMPL_ELSE --> alert('You must be logged in to create or add to Lists'); <!-- /TMPL_IF --> >+ }<!-- TMPL_ELSE --> alert(_('You must be logged in to create or add to Lists')); <!-- /TMPL_IF --> > return false; > } > if($("#addto").find("option:selected").attr("value") == "addtocart"){ >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl >index 05df994..0904901 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl >@@ -164,12 +164,12 @@ $(document).ready(function(){ > } else if($("#addto").find("option:selected").attr("value") == "newlist"){ > <!-- TMPL_IF NAME="loggedinusername" -->if (vShelfAdd()) { > Dopop('/cgi-bin/koha/opac-addbybiblionumber.pl?newshelf=1&' + vShelfAdd()); >- }<!-- TMPL_ELSE --> alert('You must be logged in to create or add to Lists'); <!-- /TMPL_IF --> >+ }<!-- TMPL_ELSE --> alert(_('You must be logged in to create or add to Lists')); <!-- /TMPL_IF --> > return false; > } else if($("#addto").find("option:selected").attr("value") == "morelists"){ > <!-- TMPL_IF NAME="loggedinusername" -->if (vShelfAdd()) { > Dopop('/cgi-bin/koha/opac-addbybiblionumber.pl?' + vShelfAdd()); >- }<!-- TMPL_ELSE --> alert('You must be logged in to create or add to Lists'); <!-- /TMPL_IF --> >+ }<!-- TMPL_ELSE --> alert(_('You must be logged in to create or add to Lists')); <!-- /TMPL_IF --> > return false; > } > if($("#addto").find("option:selected").attr("value") == "addtocart" || $("#addto").attr("class") == "addtocart"){ >-- >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