Duplicate IDs do not work for message catalogs

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

diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index 938f411..81779b6 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -1993,7 +1993,7 @@ circ.util.checkin_via_barcode2 = function(session,params,backdate,auto_print,che
                                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 @@ circ.util.checkin_via_barcode2 = function(session,params,backdate,auto_print,che
                                                        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 @@ circ.util.checkin_via_barcode2 = function(session,params,backdate,auto_print,che
                                        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 @@ circ.util.checkin_via_barcode2 = function(session,params,backdate,auto_print,che
                                        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) {

diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
index 0245127..502f30d 100644 (file)
--- a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
@@ -279,7 +279,7 @@ staff.circ.utils.billable.amount=Transaction for %1$s billable $%2$s
 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