Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Fix for Bug 5115, Tags JavaScript includes many untranslatable strings

Browse source 
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This commit is contained in:
Owen Leonard 2011-02-03 18:47:35 -05:00 committed by Chris Cormack
parent ea93d3b56e
commit dec6be9148
2 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
View file

@ -37,7 +37,6 @@
<script type="text/javascript" language="javascript"
<!-- TMPL_IF NAME="opacbookbag" -->src="<!-- TMPL_VAR NAME="themelang" -->/js/basket.js"><!-- TMPL_ELSIF NAME="virtualshelves" -->src="<!-- TMPL_VAR NAME="themelang" -->/js/basket.js"><!-- TMPL_ELSE -->>var readCookie;<!-- /TMPL_IF --></script>
<!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="TagsEnabled" --><script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/tags.js"></script><!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- /TMPL_IF -->
<script type="text/javascript" language="javascript">
//<![CDATA[
<!-- TMPL_IF NAME="opacbookbag" -->var MSG_BASKET_EMPTY = _("Your cart is currently empty");
@ -51,6 +50,19 @@
var MSG_CONFIRM_DEL_RECORDS = _("Are you sure you want to remove the selected items?");
$("#cartDetails").ready(function(){ $("#cmspan").html("<a href=\"#\" id=\"cartmenulink\" class=\"\"><i><\/i><span><i><\/i><span><\/span><img src=\"/opac-tmpl/prog/images/cart.gif\" width=\"14\" height=\"14\" alt=\"\" border=\"0\" /> "+_("Cart")+"<span id=\"basketcount\"><\/span><\/span><\/a>"); }); <!-- TMPL_ELSE --><!-- TMPL_IF NAME="virtualshelves" -->
var MSG_NO_RECORD_SELECTED = _("No item was selected");<!-- /TMPL_IF --><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="TagsEnabled" -->var MSG_TAGS_DISABLED = _("Sorry, tags are not enabled on this system.");
var MSG_TAG_ALL_BAD = _("Error! Your tag was entirely markup code. It was NOT added. Please try again with plain text.");
var MSG_ILLEGAL_PARAMETER = _("Error! Illegal parameter");
var MSG_TAG_SCRUBBED = _("Note: your tag contained markup code that was removed. The tag was added as ");
var MSG_ADD_TAG_FAILED = _("Error! The add_tag operation failed on");
var MSG_ADD_TAG_FAILED_NOTE = _("Note: you can only tag an item with a given term once. Check 'My Tags' to see your current tags.");
var MSG_DELETE_TAG_FAILED = _("Error! You cannot delete the tag");
var MSG_DELETE_TAG_FAILED_NOTE = _("Note: you can only delete your own tags.")
var MSG_LOGIN_REQUIRED = _("You must be logged in to add tags.");
var MSG_TAGS_ADDED = _("Tags added: ");
var MSG_TAGS_DELETED = _("Tags added: ");
var MSG_TAGS_ERRORS = _("Errors: ");
var MSG_MULTI_ADD_TAG_FAILED = _("Unable to add one or more tags.");<!-- /TMPL_IF --><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="OPACAmazonCoverImages" -->$(window).load(function() {
verify_images();
});<!-- /TMPL_IF -->
@ -61,7 +73,7 @@
//]]>
</script><script type="text/javascript" language="javascript"
<!-- TMPL_IF NAME="opacbookbag" -->src="<!-- TMPL_VAR NAME="themelang" -->/js/basket.js"><!-- TMPL_ELSIF NAME="virtualshelves" -->src="<!-- TMPL_VAR NAME="themelang" -->/js/basket.js"><!-- TMPL_ELSE -->>var readCookie;<!-- /TMPL_IF --></script>
<!-- TMPL_IF NAME="TagsEnabled" --><script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/tags.js"></script><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="TagsEnabled" --><script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/tags.js"></script><!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="GoogleJackets" -->
<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/google-jackets.js"></script>
<script type="text/javascript" language="javascript">

26
koha-tmpl/opac-tmpl/prog/en/js/tags.js
View file

@ -54,9 +54,9 @@ KOHA.Tags = {
},
common_status : function(addcount, delcount, errcount) {
var cstat = "";
if (addcount && addcount > 0) {cstat += _("Added ") + addcount + (addcount==1 ? _(" tag") : _(" tags")) + ". " ;}
if (delcount && delcount > 0) {cstat += _("Deleted ") + delcount + (delcount==1 ? _(" tag") : _(" tags")) + ". " ;}
if (errcount && errcount > 0) {cstat += (errcount==1 ? _("ERROR") : errcount + _(" ERRORS")) + _(" during operation.");}
if (addcount && addcount > 0) {cstat += MSG_TAGS_ADDED + addcount + ". " ;}
if (delcount && delcount > 0) {cstat += MSG_TAGS_DELETED + delcount + ". " ;}
if (errcount && errcount > 0) {cstat += MSG_TAGS_ERRORS + errcount + ". " ;}
return cstat;
},
set_tag_status : function(tagid, newstatus) {
@ -69,13 +69,13 @@ KOHA.Tags = {
},
tag_message: {
tagsdisabled : function(arg) {return (_("Sorry, tags are not enabled on this system."));},
scrubbed_all_bad : function(arg) {return (_("Error! Your tag was entirely markup code. It was NOT added. Please try again with plain text."));},
badparam : function(arg) {return (_("Error! Illegal parameter '" +arg+ "'."));},
scrubbed : function(arg) {return (_("Note: your tag contained markup code that was removed. The tag was added as '" +arg+ "'."));},
failed_add_tag : function(arg) {return (_("Error! The add_tag operation failed on '" +arg+ "'. Note: you can only tag an item with a given term once. Check 'My Tags' to see your current tags."));},
failed_delete : function(arg) {return (_("Error! You cannot delete the tag '" +arg+ "'. Note: you can only delete your own tags."));},
login : function(arg) {return (_("You must be logged in to add tags."));}
tagsdisabled : function(arg) {return (MSG_TAGS_DISABLED);},
scrubbed_all_bad : function(arg) {return (MSG_TAG_ALL_BAD);},
badparam : function(arg) {return (MSG_ILLEGAL_PARAMETER+" "+arg);},
scrubbed : function(arg) {return (MSG_TAG_SCRUBBED+" "+arg);},
failed_add_tag : function(arg) {return (MSG_ADD_TAG_FAILED+ " "+arg+" "+MSG_ADD_TAG_FAILED_NOTE);},
failed_delete : function(arg) {return (MSG_DELETE_TAG_FAILED+ " "+arg+" "+MSG_DELETE_TAG_FAILED_NOTE);},
login : function(arg) {return (MSG_LOGIN_REQUIRED);}
},
// Used to tag multiple items at once. The main difference
@ -105,7 +105,7 @@ KOHA.Tags = {
if (response[bib]) {
var added = response[bib]["added"];
if (added > 0) {
status = "Added " + added + (added == 1 ? " tag" : " tags") + ". ";
status = MSG_TAGS_ADDED + added + ". ";
KOHA.Tags.set_tag_status(mytagid + "_status", status);
}
@ -115,7 +115,7 @@ KOHA.Tags = {
bibErrors = true;
var errid = "tagerr_" + bib;
var errstat = "<a id=\"" + errid + "\" class=\"tagerror\" href=\"#\">";
errstat += "Error" + (errors.length > 1 ? "s" : "") + " adding tag.";
errstat += MSG_TAGS_ERRORS + errors.length + ". ";
errstat += "</a>";
KOHA.Tags.append_tag_status(mytagid + "_status", errstat);
var errmsg = "";
@ -135,7 +135,7 @@ KOHA.Tags = {
if (bibErrors || response["global_errors"]) {
var msg = "";
if (bibErrors) {
msg = "Unable to add one or more tags.";
msg = MSG_MULTI_ADD_TAG_FAILED;
}
// Show global errors in a dialog.