Attachment #28733 for bug #12150

View | Details | Raw Unified | Return to bug 12150
Collapse All | Expand All




        var MSG_BASKET_EMPTY = _("Your cart is currently empty");
        var MSG_RECORD_IN_BASKET = _("This item is already in your cart");
        var MSG_RECORD_ADDED = _("This item has been added to your cart");
        var MSG_NRECORDS_ADDED = _("%s item(s) added to your cart");
        var MSG_NRECORDS_IN_BASKET = _("%s already in your cart");
        var MSG_NO_RECORD_SELECTED = _("No item was selected");
        var MSG_NO_RECORD_ADDED = _("No item was added to your cart (already in your cart) !");
        var MSG_CONFIRM_DEL_BASKET = _("Are you sure you want to empty your cart?");
        var MSG_CONFIRM_DEL_RECORDS = _("Are you sure you want to remove the selected items?");
        var MSG_IN_YOUR_CART = _("Items in your cart: %s");
        var MSG_NON_RESERVES_SELECTED = _("One or more selected items cannot be reserved.");
    //]]>
    </script>

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record-strings.inc (-2 / +1 lines)
1	[%# transletable strings for merge-record.js %]	1	[%# transletable strings for merge-record.js %]
2	<script type="text/javascript">	2	<script type="text/javascript">
3	var MSG_MERGEREC_ALREADY_EXISTS = _("The field is non-repeatable and already exists in the destination record. Therefore, you cannot add it.");	3	var MSG_MERGEREC_ALREADY_EXISTS = _("The field is non-repeatable and already exists in the destination record. Therefore, you cannot add it.");
4	var MSG_MERGEREC_SUBFIELD_PRE = _("This subfield cannot be added: there is no");	4	var MSG_MERGEREC_SUBFIELD = _("This subfield cannot be added: there is no %s field in the destination record.");
5	var MSG_MERGEREC_SUBFIELD_POST = _("field in the destination record.");
6	</script>	5	</script>




    var msg = "";
    if (nbAdd) {
        if (i > nbAdd) {
            msg = MSG_NRECORDS_ADDED.format(nbAdd);
            msg += MSG_NRECORDS_IN_BASKET.format((i-nbAdd));
        }
        else {
            msg = MSG_NRECORDS_ADDED.format(nbAdd);
        }
    }
    else {

            msg = MSG_NO_RECORD_SELECTED;
        }
        else {
            msg = MSG_NO_RECORD_ADDED;
        }
    }
	showCartUpdate(msg);

function updateBasket(updated_value,target) {
	if(target){
	target.$('#basketcount').html(" <span>("+updated_value+")</span>");
    target.$('#cartDetails').html(MSG_IN_YOUR_CART.format(updated_value));
	} else {
	$('#basketcount').html(" <span>("+updated_value+")</span>");
    $('#cartDetails').html(MSG_IN_YOUR_CART.format(updated_value));
	}
	var basketcount = updated_value;
}




            replace_html_date( original_node, id, format );
            break;
        default:
            alert(_("This node can't be replaced"));
    }
}

// Replace a node with a "From [date] To [date]" element
// Used on tfoot > td
function replace_html_date( original_node, id, format ) {
    var node = $('<span style="white-space:nowrap">' + _("From") + '<input type="text" id="' + id + 'from" readonly="readonly" placeholder=\'' + _("Pick date") + '\' size="7" /><a title="' + _("Delete this filter") + '" style="cursor:pointer" onclick=\'$("#' + id + 'from").val("").change();\' >&times;</a></span><br/><span style="white-space:nowrap">' + _("To") + '<input type="text" id="' + id + 'to" readonly="readonly" placeholder=\'' + _("Pick date") + '\' size="7" /><a title="' + _("Delete this filter") + '" style="cursor:pointer" onclick=\'$("#' + id + 'to").val("").change();\' >&times;</a></span>');
    $(original_node).replaceWith(node);
    var script = document.createElement( 'script' );
    script.type = 'text/javascript';




      var ok=1;
      var msg;
      if ( (date.length < 2) && (ok==1) ) {
        msg = MSG_SEPARATOR.format(field.name);
        alert(msg); ok=0; field.focus();
        return;
      }

      var yyyy = date[2];
      // checking days
      if ( ((isNaN(dd))||(dd<1)||(dd>31)) && (ok==1) ) {
        msg = MSG_INCORRECT_DAY.format(field.name);
        alert(msg); ok=0; field.focus();
        return false;
      }
      // checking months
      if ( ((isNaN(mm))||(mm<1)||(mm>12)) && (ok==1) ) {
        msg = MSG_INCORRECT_MONTH.format(field.name);
        alert(msg); ok=0; field.focus();
        return false;
      }
      // checking years
      if ( ((isNaN(yyyy))||(yyyy<amin)||(yyyy>amax)) && (ok==1) ) {
        msg = MSG_INCORRECT_YEAR.format(field.name);
        alert(msg); ok=0; field.focus();
        return false;
      }

Lines 91-97 function toggleField(pField) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/js/merge-record.js (-1 / +1 lines)
91	// We select the whole field and removing non-selected subfields, instead of...	91	// We select the whole field and removing non-selected subfields, instead of...
92		92
93	// Alerting the user	93	// Alerting the user
94	alert(MSG_MERGEREC_SUBFIELD_PRE + " " + field + " " + MSG_MERGEREC_SUBFIELD_POST);	94	alert(MSG_MERGEREC_SUBFIELD.format(field));
95	pField.checked = false;	95	pField.checked = false;
96	} else {	96	} else {
97	$(where).nextAll("ul").append(clone);	97	$(where).nextAll("ul").append(clone);

Lines 8-14 KOHA.Preferences = { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/js/pages/preferences.js (-2 / +2 lines)
8	humanMsg.displayAlert( MSG_NOTHING_TO_SAVE );	8	humanMsg.displayAlert( MSG_NOTHING_TO_SAVE );
9	return;	9	return;
10	}	10	}
11	KOHA.AJAX.MarkRunning( $( form ).find( '.save-all' ), _( MSG_SAVING ) );	11	KOHA.AJAX.MarkRunning( $( form ).find( '.save-all' ), MSG_SAVING );
12	KOHA.AJAX.Submit( {	12	KOHA.AJAX.Submit( {
13	data: data,	13	data: data,
14	url: '/cgi-bin/koha/svc/config/systempreferences/',	14	url: '/cgi-bin/koha/svc/config/systempreferences/',
Lines 21-27 KOHA.Preferences = { Link Here
21	modified_prefs.each(function(){	21	modified_prefs.each(function(){
22	var modified_pref = $(this).attr("id");	22	var modified_pref = $(this).attr("id");
23	modified_pref = modified_pref.replace("pref_","");	23	modified_pref = modified_pref.replace("pref_","");
24	msg += "<strong>"+ MSG_SAVED_PREFERENCE + " " + modified_pref + "</strong>\n";	24	msg += "<strong>"+ MSG_SAVED_PREFERENCE.format(modified_pref) + "</strong>\n";
25	});	25	});
26	humanMsg.displayAlert(msg);	26	humanMsg.displayAlert(msg);
27		27

Lines 212-218 function changeH4Result(form, h4_result, tr_result, pos, value) Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/js/xmlControlfield.js (-1 / +1 lines)
212	}).responseXML;	212	}).responseXML;
213	if (this.xmlDoc) this.renderTemplate();	213	if (this.xmlDoc) this.renderTemplate();
214	$("*").ajaxError(function(evt, request, settings){	214	$("*").ajaxError(function(evt, request, settings){
215	alert(_("AJAX error: receiving data from ") + settings.url);	215	alert(_("AJAX error: receiving data from %s").format(settings.url));
216	});	216	});
217	},//loadXmlValues	217	},//loadXmlValues
218		218

Lines 18-24 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt (-1 / +1 lines)
18	var search_jumped = [% IF ( search_jumped ) %]true[% ELSE %]false[% END %];	18	var search_jumped = [% IF ( search_jumped ) %]true[% ELSE %]false[% END %];
19	var MSG_NOTHING_TO_SAVE = _("Nothing to save");	19	var MSG_NOTHING_TO_SAVE = _("Nothing to save");
20	var MSG_SAVING = _("Saving...");	20	var MSG_SAVING = _("Saving...");
21	var MSG_SAVED_PREFERENCE = _("Saved preference");	21	var MSG_SAVED_PREFERENCE = _("Saved preference %s");
22	var MSG_MODIFIED = _("modified");	22	var MSG_MODIFIED = _("modified");
23	var MSG_MADE_CHANGES = _("You have made changes to system preferences.");	23	var MSG_MADE_CHANGES = _("You have made changes to system preferences.");
24	var MSG_CLICK_TO_EXPAND = _("Click to expand this section");	24	var MSG_CLICK_TO_EXPAND = _("Click to expand this section");




<script type="text/javascript">
//<![CDATA[
var ALERT_SUCCESSFUL_CHECKIN = _("Checked in item.");
var ALERT_MATERIALS = _("Note about the accompanying materials: %s");
var ALERT_RESTRICTED = _("Patron is RESTRICTED");
var ALERT_NO_MATCHING_ITEM = _("No item with barcode in offline database (transaction recorded anyway): %s");
var ALERT_NOT_CHECKED_OUT = _("Item not listed as checked out in offline database (transaction recorded anyway)");
var ALERT_ITEM_WITHDRAWN = _("Item has been withdrawn (transaction recorded anyway)");
var ALERT_ITEM_RESTRICTED = _("Item is restricted (transaction recorded anyway)");
var ALERT_ITEM_LOST = _("Item has been lost (transaction recorded anyway)");
var ALERT_NO_MATCHING_PATRON = _("No patron cardnumber in offline database (proceeding anyway): %s");
var ALERT_PATRON_GONE_NO_ADDRESS = _("Patron's address is in doubt (proceeding anyway)");
var ALERT_PATRON_CARD_LOST = _("Patron's card is lost");
var ALERT_PATRON_EXPIRED = _("Patron's card is expired (%s)");
var ALERT_PATRON_BLOCKED_TEMPORARY = _("Patron has had overdue items and is restricted until: %s");
var ALERT_PATRON_RESTRICTED = _("Patron is restricted");
var ALERT_PATRON_FINE = _("Patron has outstanding fines: %s");
var ALERT_PATRON_FINE_OVER_LIMIT = _("Patron fines are over limit: %s");
var UPLOAD_PENDING_MESSAGE = _("You have transactions in the offline circulation database on this computer that have not been uploaded.");
var NO_UPLOAD_PENDING_MESSAGE = _("You do not have any pending transactions in the offline circulation database on this computer.");


function checkAlerts(barcode, item) {
    var alerts = [];
    if (typeof item === 'undefined') {
        alerts.push(ALERT_NO_MATCHING_ITEM.format(barcode));
    } else {
        if (typeof item.materials !== 'undefined' && item.materials != null) {
            alerts.push(ALERT_MATERIALS.format(item.materials));
        }
    }
    return alerts;

function checkPatronAlerts(cardnumber, patron) {
    var alerts = [];
    if (typeof patron === 'undefined') {
        alerts.push(ALERT_NO_MATCHING_PATRON.format(cardnumber));
    } else {
        if (patron.gonenoaddress !== '0') {
            alerts.push(ALERT_PATRON_GONE_NO_ADDRESS);

        }
        if (patron.debarred !== null) {
            if (patron.debarred != '9999-12-31') {
                alerts.push(ALERT_PATRON_BLOCKED_TEMPORARY.format($.datepicker.formatDate(dateformat, new Date(patron.debarred))));
            } else {
                alerts.push(ALERT_PATRON_RESTRICTED);
            }
        }
        if (new Date(patron.dateexpiry) < new Date()) {
            alerts.push(ALERT_PATRON_EXPIRED.format($.datepicker.formatDate(dateformat, new Date(patron.dateexpiry))));
        }
        if (parseInt(patron.fine) > [% maxoutstanding %]) {
            alerts.push(ALERT_PATRON_FINE_OVER_LIMIT.format(patron.fine));
        } else if (parseInt(patron.fine) > 0) {
            alerts.push(ALERT_PATRON_FINE.format(patron.fine));
        }
    }
    return alerts;

Lines 103-112 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-4 / +4 lines)
103	$(mytables).find(" li[data-category_code='']").show();	103	$(mytables).find(" li[data-category_code='']").show();
104	}	104	}
105		105
106	var MSG_SEPARATOR = _("Separator must be / in field ");	106	var MSG_SEPARATOR = _("Separator must be / in field %s");
107	var MSG_INCORRECT_DAY = _("Invalid day entered in field ");	107	var MSG_INCORRECT_DAY = _("Invalid day entered in field %s");
108	var MSG_INCORRECT_MONTH = _("Invalid month entered in field ");	108	var MSG_INCORRECT_MONTH = _("Invalid month entered in field %s");
109	var MSG_INCORRECT_YEAR = _("Invalid year entered in field ");	109	var MSG_INCORRECT_YEAR = _("Invalid year entered in field %s");
110	var MSG_DUPLICATE_PATRON = _("Warning: Duplicate patron");	110	var MSG_DUPLICATE_PATRON = _("Warning: Duplicate patron");
111	var MSG_DUPLICATE_ORGANIZATION = _("Warning: Duplicate organization");	111	var MSG_DUPLICATE_ORGANIZATION = _("Warning: Duplicate organization");
112	var MSG_LATE_EXPIRY = _("Warning: Expiration date falls before enrollment date");	112	var MSG_LATE_EXPIRY = _("Warning: Expiration date falls before enrollment date");

Lines 202-208 function editAction( mmta_id, ordering, action, field_number, from_field, from_s Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt (-2 / +1 lines)
202	document.getElementById('description').value = description;	202	document.getElementById('description').value = description;
203		203
204	window.modaction_legend_innerhtml = document.getElementById('modaction_legend').innerhtml;	204	window.modaction_legend_innerhtml = document.getElementById('modaction_legend').innerhtml;
205	document.getElementById('modaction_legend').innerhtml = _("Edit action") + ordering;	205	document.getElementById('modaction_legend').innerhtml = _("Edit action%s").format(ordering);
206		206
207	window.action_submit_value = document.getElementById('action_submit').value;	207	window.action_submit_value = document.getElementById('action_submit').value;
208	document.getElementById('action_submit').value = _("Update action");	208	document.getElementById('action_submit').value = _("Update action");
209	-

Return to bug 12150

Lines 36-48 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc (-4 / +4 lines)
36	var MSG_BASKET_EMPTY = _("Your cart is currently empty");	36	var MSG_BASKET_EMPTY = _("Your cart is currently empty");
37	var MSG_RECORD_IN_BASKET = _("This item is already in your cart");	37	var MSG_RECORD_IN_BASKET = _("This item is already in your cart");
38	var MSG_RECORD_ADDED = _("This item has been added to your cart");	38	var MSG_RECORD_ADDED = _("This item has been added to your cart");
39	var MSG_NRECORDS_ADDED = _(" item(s) added to your cart");	39	var MSG_NRECORDS_ADDED = _("%s item(s) added to your cart");
40	var MSG_NRECORDS_IN_BASKET = _("already in your cart");	40	var MSG_NRECORDS_IN_BASKET = _("%s already in your cart");
41	var MSG_NO_RECORD_SELECTED = _("No item was selected");	41	var MSG_NO_RECORD_SELECTED = _("No item was selected");
42	var MSG_NO_RECORD_ADDED = _("No item was added to your cart");	42	var MSG_NO_RECORD_ADDED = _("No item was added to your cart (already in your cart) !");
43	var MSG_CONFIRM_DEL_BASKET = _("Are you sure you want to empty your cart?");	43	var MSG_CONFIRM_DEL_BASKET = _("Are you sure you want to empty your cart?");
44	var MSG_CONFIRM_DEL_RECORDS = _("Are you sure you want to remove the selected items?");	44	var MSG_CONFIRM_DEL_RECORDS = _("Are you sure you want to remove the selected items?");
45	var MSG_IN_YOUR_CART = _("Items in your cart: ");	45	var MSG_IN_YOUR_CART = _("Items in your cart: %s");
46	var MSG_NON_RESERVES_SELECTED = _("One or more selected items cannot be reserved.");	46	var MSG_NON_RESERVES_SELECTED = _("One or more selected items cannot be reserved.");
47	//]]>	47	//]]>
48	</script>	48	</script>

Lines 184-193 function addSelRecords(valSel) { // function for adding a selection of biblios t Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/js/basket.js (-5 / +6 lines)
184	var msg = "";	184	var msg = "";
185	if (nbAdd) {	185	if (nbAdd) {
186	if (i > nbAdd) {	186	if (i > nbAdd) {
187	msg = nbAdd+" "+MSG_NRECORDS_ADDED+", "+(i-nbAdd)+" "+MSG_NRECORDS_IN_BASKET;	187	msg = MSG_NRECORDS_ADDED.format(nbAdd);
		188	msg += MSG_NRECORDS_IN_BASKET.format((i-nbAdd));
188	}	189	}
189	else {	190	else {
190	msg = nbAdd+" "+MSG_NRECORDS_ADDED;	191	msg = MSG_NRECORDS_ADDED.format(nbAdd);
191	}	192	}
192	}	193	}
193	else {	194	else {
Lines 195-201 function addSelRecords(valSel) { // function for adding a selection of biblios t Link Here
195	msg = MSG_NO_RECORD_SELECTED;	196	msg = MSG_NO_RECORD_SELECTED;
196	}	197	}
197	else {	198	else {
198	msg = MSG_NO_RECORD_ADDED+" ("+MSG_NRECORDS_IN_BASKET+") !";	199	msg = MSG_NO_RECORD_ADDED;
199	}	200	}
200	}	201	}
201	showCartUpdate(msg);	202	showCartUpdate(msg);
Lines 378-387 function showLess() { Link Here
378	function updateBasket(updated_value,target) {	379	function updateBasket(updated_value,target) {
379	if(target){	380	if(target){
380	target.$('#basketcount').html(" <span>("+updated_value+")</span>");	381	target.$('#basketcount').html(" <span>("+updated_value+")</span>");
381	target.$('#cartDetails').html(MSG_IN_YOUR_CART+updated_value);	382	target.$('#cartDetails').html(MSG_IN_YOUR_CART.format(updated_value));
382	} else {	383	} else {
383	$('#basketcount').html(" <span>("+updated_value+")</span>");	384	$('#basketcount').html(" <span>("+updated_value+")</span>");
384	$('#cartDetails').html(MSG_IN_YOUR_CART+updated_value);	385	$('#cartDetails').html(MSG_IN_YOUR_CART.format(updated_value));
385	}	386	}
386	var basketcount = updated_value;	387	var basketcount = updated_value;
387	}	388	}

Lines 232-245 function replace_html( original_node, type ) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js (-2 / +2 lines)
232	replace_html_date( original_node, id, format );	232	replace_html_date( original_node, id, format );
233	break;	233	break;
234	default:	234	default:
235	alert("_(This node can't be replaced)");	235	alert(_("This node can't be replaced"));
236	}	236	}
237	}	237	}
238		238
239	// Replace a node with a "From [date] To [date]" element	239	// Replace a node with a "From [date] To [date]" element
240	// Used on tfoot > td	240	// Used on tfoot > td
241	function replace_html_date( original_node, id, format ) {	241	function replace_html_date( original_node, id, format ) {
242	var node = $('<span style="white-space:nowrap">' + _("From") + '<input type="text" id="' + id + 'from" readonly="readonly" placeholder=\'' + _("Pick date") + '\' size="7" /><a title="Delete this filter" style="cursor:pointer" onclick=\'$("#' + id + 'from").val("").change();\' >×</a></span><br/><span style="white-space:nowrap">' + _("To") + '<input type="text" id="' + id + 'to" readonly="readonly" placeholder=\'' + _("Pick date") + '\' size="7" /><a title="Delete this filter" style="cursor:pointer" onclick=\'$("#' + id + 'to").val("").change();\' >×</a></span>');	242	var node = $('<span style="white-space:nowrap">' + _("From") + '<input type="text" id="' + id + 'from" readonly="readonly" placeholder=\'' + _("Pick date") + '\' size="7" /><a title="' + _("Delete this filter") + '" style="cursor:pointer" onclick=\'$("#' + id + 'from").val("").change();\' >×</a></span><br/><span style="white-space:nowrap">' + _("To") + '<input type="text" id="' + id + 'to" readonly="readonly" placeholder=\'' + _("Pick date") + '\' size="7" /><a title="' + _("Delete this filter") + '" style="cursor:pointer" onclick=\'$("#' + id + 'to").val("").change();\' >×</a></span>');
243	$(original_node).replaceWith(node);	243	$(original_node).replaceWith(node);
244	var script = document.createElement( 'script' );	244	var script = document.createElement( 'script' );
245	script.type = 'text/javascript';	245	script.type = 'text/javascript';

Lines 8-14 if (d!=="") { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/js/members.js (-4 / +4 lines)
8	var ok=1;	8	var ok=1;
9	var msg;	9	var msg;
10	if ( (date.length < 2) && (ok==1) ) {	10	if ( (date.length < 2) && (ok==1) ) {
11	msg = MSG_SEPARATOR+field.name;	11	msg = MSG_SEPARATOR.format(field.name);
12	alert(msg); ok=0; field.focus();	12	alert(msg); ok=0; field.focus();
13	return;	13	return;
14	}	14	}
Lines 17-35 if (d!=="") { Link Here
17	var yyyy = date[2];	17	var yyyy = date[2];
18	// checking days	18	// checking days
19	if ( ((isNaN(dd))\|\|(dd<1)\|\|(dd>31)) && (ok==1) ) {	19	if ( ((isNaN(dd))\|\|(dd<1)\|\|(dd>31)) && (ok==1) ) {
20	msg = MSG_INCORRECT_DAY+field.name;	20	msg = MSG_INCORRECT_DAY.format(field.name);
21	alert(msg); ok=0; field.focus();	21	alert(msg); ok=0; field.focus();
22	return false;	22	return false;
23	}	23	}
24	// checking months	24	// checking months
25	if ( ((isNaN(mm))\|\|(mm<1)\|\|(mm>12)) && (ok==1) ) {	25	if ( ((isNaN(mm))\|\|(mm<1)\|\|(mm>12)) && (ok==1) ) {
26	msg = MSG_INCORRECT_MONTH+field.name;	26	msg = MSG_INCORRECT_MONTH.format(field.name);
27	alert(msg); ok=0; field.focus();	27	alert(msg); ok=0; field.focus();
28	return false;	28	return false;
29	}	29	}
30	// checking years	30	// checking years
31	if ( ((isNaN(yyyy))\|\|(yyyy<amin)\|\|(yyyy>amax)) && (ok==1) ) {	31	if ( ((isNaN(yyyy))\|\|(yyyy<amin)\|\|(yyyy>amax)) && (ok==1) ) {
32	msg = MSG_INCORRECT_YEAR+field.name;	32	msg = MSG_INCORRECT_YEAR.format(field.name);
33	alert(msg); ok=0; field.focus();	33	alert(msg); ok=0; field.focus();
34	return false;	34	return false;
35	}	35	}