[open-ils-commits] [GIT] Evergreen ILS branch master updated. 4dee803ca182714c7bfd9f3cc82b8976c48fea38

Evergreen Git git at git.evergreen-ils.org
Fri Mar 15 02:35:08 EDT 2013


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  4dee803ca182714c7bfd9f3cc82b8976c48fea38 (commit)
      from  d4f6bf89576e470f16214f5848b0782e4bec8573 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4dee803ca182714c7bfd9f3cc82b8976c48fea38
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date:   Thu Mar 14 11:21:01 2013 +0200

    Allow translating one final untranslatable error message in checkout interface
    
    Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/xul/staff_client/server/circ/checkout.js b/Open-ILS/xul/staff_client/server/circ/checkout.js
index 79c2cd1..ea6afa6 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkout.js
+++ b/Open-ILS/xul/staff_client/server/circ/checkout.js
@@ -709,7 +709,7 @@ circ.checkout.prototype = {
                                 status_name = obj.data.hash.ccs[ r.payload.status() ].name();
                                 return status_name;
                             } catch (E) {
-                                return "Could not retrieve the name of the current status for the copy";  // XXX
+                                return document.getElementById('circStrings').getString('staff.circ.checkout.error_retrieving_copy_status');
                             }
                         },
                         '7010' : function(r) {
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 0cba799..2f058ae 100644
--- a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
@@ -49,6 +49,7 @@ staff.circ.checkout.override.confirm=Override Checkout Failure?
 staff.circ.checkout.override.item_deposit_required.warning=A billing for an Item Deposit will be added to the patron's account if this action is overrided.
 staff.circ.checkout.override.item_rental_fee_required.warning=A billing for an Item Rental Fee will be added to the patron's account if this action is overrided.
 staff.circ.checkout.override.will_auto=If overriden now, subsequent checkouts during this patron's session will auto-override this event.
+staff.circ.checkout.error_retrieving_copy_status=Could not retrieve the name of the current status for the copy
 staff.circ.checkout.not_cataloged.confirm=Barcode %1$s was either mis-scanned or is a non-cataloged item.  Checkout as a pre-cataloged item?
 staff.circ.pre_cataloged=Pre-cataloged
 staff.circ.non_cataloged=Non-cataloged

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/xul/staff_client/server/circ/checkout.js  |    2 +-
 .../server/locale/en-US/circ.properties            |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list