[open-ils-commits] [GIT] Evergreen ILS branch master updated. 153a840b78bd224351bfe779d6720eb04958d892

[Evergreen Git]

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  153a840b78bd224351bfe779d6720eb04958d892 (commit)
      from  b137ced2eb64640d0dd144122da415c9a9d95b45 (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 153a840b78bd224351bfe779d6720eb04958d892
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date:   Tue Jul 16 18:33:32 2013 +0300

    Fix untranslatable strings in the selfcheck 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/web/js/dojo/openils/circ/nls/selfcheck.js b/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js
index 766fcbc..395a6a1 100644
--- a/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js
+++ b/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js
@@ -20,6 +20,10 @@
     "CC_PAYABLE_BALANCE" : "Total amount to pay: $${0}",
     "TOTAL_FINES_SELECTED" : "Selected total: $${0}",
     "WELCOME_BANNER" : "Welcome, ${0}",
+    "ENTER_PASSWORD" : "Please enter your password",
+    "PLEASE_LOGIN" : "Please log in with your username or library barcode.",
+    "ENTER_BARCODE" : "Please enter an item barcode",
+    "MISCELLANEOUS" : "Miscellaneous",
     "FAIL_PART_actor_usr_barred": "The patron is barred",
     "FAIL_PART_asset_copy_circulate": "The item does not circulate",
     "FAIL_PART_asset_copy_location_circulate": "Items from this shelving location do not circulate",
diff --git a/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js b/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
index 0b47be3..1f2448a 100644
--- a/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
+++ b/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
@@ -287,7 +287,7 @@ SelfCheckManager.prototype.drawLoginPage = function() {
             
             // password is required.  wire up the scan box to read it
             self.updateScanBox({
-                msg : 'Please enter your password', // TODO i18n 
+                msg : localeStrings.ENTER_PASSWORD,
                 handler : function(pw) { self.loginPatron(barcode_or_usrname, pw); },
                 password : true
             });
@@ -299,7 +299,7 @@ SelfCheckManager.prototype.drawLoginPage = function() {
     };
 
     this.updateScanBox({
-        msg : 'Please log in with your username or library barcode.', // TODO
+        msg : localeStrings.PLEASE_LOGIN,
         handler : bcHandler
     });
 }
@@ -479,7 +479,7 @@ SelfCheckManager.prototype.drawCircPage = function() {
 
     var self = this;
     this.updateScanBox({
-        msg : 'Please enter an item barcode', // TODO i18n
+        msg : localeStrings.ENTER_BARCODE,
         handler : function(barcode) { self.checkout(barcode); }
     });
 
@@ -835,7 +835,7 @@ SelfCheckManager.prototype.drawFinesPage = function() {
                 self.byName(row, 'details').innerHTML = data.record.title();
 
             } else if(type == 'grocery') {
-                self.byName(row, 'type').innerHTML = 'Miscellaneous'; // Go ahead and head off any confusion around "grocery".  TODO i18n
+                self.byName(row, 'type').innerHTML = localeStrings.MISCELLANEOUS; // Go ahead and head off any confusion around "grocery".
                 self.byName(row, 'details').innerHTML = data.transaction.last_billing_type();
             }
 

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

Summary of changes:
 Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js |    4 ++++
 .../web/js/ui/default/circ/selfcheck/selfcheck.js  |    8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS