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

Bug 10576: make strings in additem.js accessible to translation

Browse source 
There are a couple of untranslatable strings in additem.js. This patch
moves the strings out of the script and into the include file which has
been created for this purpose.

To test, apply the patch and test the process for adding an item to an
existing or new basket (with AcqCreateItem set to "when placing an
order."

The add item form should be correctly labeled "Add item." After adding
an item, click to edit it again. The form should now be labeled "Update
item."

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely and passes all tests.
Made sure strings can be translated testing with German templates.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This commit is contained in:
Owen Leonard 2013-07-11 10:53:06 -04:00 committed by Galen Charlton
parent 04dd98fa84
commit b7305e4876
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/includes/additem.js.inc
View file

@ -1,5 +1,7 @@
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
var MSG_ADDITEM_JS_ADDITEM = _("Add item");
var MSG_ADDITEM_JS_UPDATEITEM = _("Update item");
var MSG_ADDITEM_JS_EDIT = _("Edit"); var MSG_ADDITEM_JS_EDIT = _("Edit");
var MSG_ADDITEM_JS_DELETE = _("Delete"); var MSG_ADDITEM_JS_DELETE = _("Delete");
var MSG_ADDITEM_JS_CLEAR = _("Clear"); var MSG_ADDITEM_JS_CLEAR = _("Clear");

5
koha-tmpl/intranet-tmpl/prog/en/js/additem.js
View file

@ -12,7 +12,7 @@ function addItem( node, unique_item_fields ) {
if ( current_qty < max_qty - 1 ) if ( current_qty < max_qty - 1 )
cloneItemBlock(index, unique_item_fields); cloneItemBlock(index, unique_item_fields);
addItemInList(index, unique_item_fields); addItemInList(index, unique_item_fields);
$("#" + index).find("input[name='buttonPlus']").val("Update"); $("#" + index).find("input[name='buttonPlus']").val( (window.MSG_ADDITEM_JS_UPDATEITEM || "Update item") );
$("#quantity").val(current_qty + 1).change(); $("#quantity").val(current_qty + 1).change();
} else if ( current_qty >= max_qty ) { } else if ( current_qty >= max_qty ) {
alert(window.MSG_ADDITEM_JS_CANT_RECEIVE_MORE_ITEMS alert(window.MSG_ADDITEM_JS_CANT_RECEIVE_MORE_ITEMS
@ -135,8 +135,7 @@ function cloneItemBlock(index, unique_item_fields) {
}); });
/* Add buttons + and Clear */ /* Add buttons + and Clear */
var buttonPlus = "<fieldset class=\"action\">"; var buttonPlus = "<fieldset class=\"action\">";
var buttonPlusText = _("Add item"); buttonPlus += '<input type="button" class="addItemControl" name="buttonPlus" style="cursor:pointer; margin:0 1em;" onclick="addItem(this,\'' + unique_item_fields + '\')" value="' + (window.MSG_ADDITEM_JS_ADDITEM || 'Add item')+ '" />';
buttonPlus += '<input type="button" class="addItemControl" name="buttonPlus" style="cursor:pointer; margin:0 1em;" onclick="addItem(this,\'' + unique_item_fields + '\')" value="' + buttonPlusText + '" />';
buttonPlus += '<a class="addItemControl cancel" name="buttonClear" style="cursor:pointer;" onclick="clearItemBlock(this)">' + (window.MSG_ADDITEM_JS_CLEAR || 'Clear') + '</a>'; buttonPlus += '<a class="addItemControl cancel" name="buttonClear" style="cursor:pointer;" onclick="clearItemBlock(this)">' + (window.MSG_ADDITEM_JS_CLEAR || 'Clear') + '</a>';
buttonPlus += "</fieldset>"; buttonPlus += "</fieldset>";
$(clone).append(buttonPlus); $(clone).append(buttonPlus);