[open-ils-commits] r12382 - in branches/rel_1_4_0/Open-ILS/xul/staff_client/server: locale/en-US patron (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2009-03-03 11:55:36 -0500 (Tue, 03 Mar 2009)
New Revision: 12382

Modified:
   branches/rel_1_4_0/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties
   branches/rel_1_4_0/Open-ILS/xul/staff_client/server/patron/items.js
Log:
Merge r12380 and r12377 from trunk: fix check-in from patron items out interface; fix renewal of multiple items

Modified: branches/rel_1_4_0/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties
===================================================================
--- branches/rel_1_4_0/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties	2009-03-03 16:49:25 UTC (rev 12381)
+++ branches/rel_1_4_0/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties	2009-03-03 16:55:36 UTC (rev 12382)
@@ -199,7 +199,7 @@
 staff.patron.items.items_renew_all.renew_items_in_list=Renew all the items in this list?
 staff.patron.items.items_renew_all.items_not_renewed=All items were not likely renewed (%1$s)
 staff.patron.items.items_renew.renew_item_singular=Are you sure you would like to renew item %1$s?
-staff.patron.items.items_renew.renew_item_singular=Are you sure you would like to renew items %1$s?
+staff.patron.items.items_renew.renew_item_plural=Are you sure you would like to renew items %1$s?
 staff.patron.items.items_renew.renewing=Renewing %1$s
 staff.patron.items.items_renew.renewed=%1$s renewed.
 staff.patron.items.items_renew.not_renewed=%1$s not renewed.\n%2$s

Modified: branches/rel_1_4_0/Open-ILS/xul/staff_client/server/patron/items.js
===================================================================
--- branches/rel_1_4_0/Open-ILS/xul/staff_client/server/patron/items.js	2009-03-03 16:49:25 UTC (rev 12381)
+++ branches/rel_1_4_0/Open-ILS/xul/staff_client/server/patron/items.js	2009-03-03 16:55:36 UTC (rev 12382)
@@ -469,7 +469,7 @@
 				msg += $("patronStrings").getFormattedString('staff.patron.items.items_checkin.confirm_item_check_in.plural',
 					[util.functional.map_list( retrieve_ids, function(o){return o.barcode;}).join(', ')]);
 			} else {
-				msg += $("patronStrings").getFormattedString('staff.patron.items.items_checkin.confirm_item_check_in.singular'
+				msg += $("patronStrings").getFormattedString('staff.patron.items.items_checkin.confirm_item_check_in.singular',
 					[util.functional.map_list( retrieve_ids, function(o){return o.barcode;}).join(', ')]);
 			}
 			var r = window.confirm(msg);