[open-ils-commits] r9132 - in trunk/Open-ILS/xul/staff_client/server: circ locale/en-US

[svn at svn.open-ils.org]

Author: dbs
Date: 2008-03-24 21:18:41 -0400 (Mon, 24 Mar 2008)
New Revision: 9132

Modified:
   trunk/Open-ILS/xul/staff_client/server/circ/util.js
   trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
Log:
Duplicate IDs do not work for message catalogs


Modified: trunk/Open-ILS/xul/staff_client/server/circ/util.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/util.js	2008-03-25 00:57:25 UTC (rev 9131)
+++ trunk/Open-ILS/xul/staff_client/server/circ/util.js	2008-03-25 01:18:41 UTC (rev 9132)
@@ -1993,7 +1993,7 @@
 				case 0: /* AVAILABLE */
 				case 7: /* RESHELVING */
 					if (msg) {
-						msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to', [check.route_to]);
+						msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to.msg', [check.route_to]);
 						msg += '\n';
 					}
 				break;
@@ -2006,7 +2006,7 @@
 							msg += document.getElementById('circStrings').getString('staff.circ.utils.route_item_error');
 							msg += '\n';
 						} else {
-							msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to', [check.route_to]);
+							msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to.msg', [check.route_to]);
 							msg += '.\n';
 						}
 					} else {
@@ -2087,10 +2087,10 @@
 					if (document.getElementById('do_not_alert_on_precat')) {
 						var x = document.getElementById('do_not_alert_on_precat');
 						if (! x.checked) {
-							msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to', [check.route_to]);
+							msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to.msg', [check.route_to]);
 						}
 					} else {
-						msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to', [check.route_to]);
+						msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to.msg', [check.route_to]);
 					}
 					if (document.getElementById('no_change_label')) {
 						var m = document.getElementById('no_change_label').getAttribute('value');
@@ -2105,7 +2105,7 @@
 					msg += '\n';
 					msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.copy_status.error', [copy_status]);
 					msg += '\n';
-					msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to', [check.route_to]);
+					msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to.msg', [check.route_to]);
 				break;
 			}
 			if (msg) {

Modified: trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties	2008-03-25 00:57:25 UTC (rev 9131)
+++ trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties	2008-03-25 01:18:41 UTC (rev 9132)
@@ -279,7 +279,7 @@
 staff.circ.utils.transit_hold_cancelled=Original hold for transit cancelled.
 staff.circ.utils.item_checked_in=%1$s was already checked in.
 staff.circ.utils.item_not_cataloged=ITEM_NOT_CATALOGED event but copy status is %1$s
-staff.circ.utils.route_to=This item needs to be routed to %1$s
+staff.circ.utils.route_to.msg=This item needs to be routed to %1$s
 staff.circ.utils.route_item_error=We should have received a ROUTE_ITEM
 staff.circ.utils.route_item_status_error=status of Holds Shelf, but no actual hold found.
 staff.circ.utils.payload.hold.barcode=Barcode: %1$s