Merge r12380 and r12377 from trunk: fix check-in from patron items out interface...

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_4_0@12382 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties b/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties
index ab21880..8f80e2c 100644 (file)
--- a/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties
@@ -199,7 +199,7 @@ staff.patron.items.items_renew_all.list_is_busy=This is list is busy retrieving
 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

diff --git a/Open-ILS/xul/staff_client/server/patron/items.js b/Open-ILS/xul/staff_client/server/patron/items.js
index 6496410..ec4c2bb 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/items.js
+++ b/Open-ILS/xul/staff_client/server/patron/items.js
@@ -469,7 +469,7 @@ patron.items.prototype = {
                                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);