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

[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  f9a57897338dd2568c5057d0ff0ed37ffe40ba57 (commit)
      from  78ef108791fd2ec1050aab057464f5fbbd175feb (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 f9a57897338dd2568c5057d0ff0ed37ffe40ba57
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date:   Mon May 27 13:01:52 2013 +0300

    LP1182393: 'Service' in circ offline checkout columns is untranslatable
    
    Move that string into the common message catalog as
    staff.checkout_column_label_service
    
    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/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index 9c41675..4c8a080 100644
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -548,7 +548,7 @@ circ.util.columns = function(modify,params) {
         {
             'persist' : 'hidden width ordinal',
             'id' : 'service',
-            'label' : 'Service',
+            'label' : document.getElementById('commonStrings').getString('staff.checkout_column_label_service'),
             'flex' : 1,
             'primary' : false,
             'hidden' : true,
diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/common.properties b/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
index 612fbb1..e30c5aa 100644
--- a/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
@@ -30,6 +30,7 @@ openils.global_util.content_window.error=Error with get_contentWindow(%1$s): %2$
 openils.global_util.font_size.error=Error adjusting the font size: %1$s
 # Appended to notes with certain settings enabled.  First position is staff initials, and second position is a date for when the initials were added.
 staff.initials.format= [ %1$s %2$s @ %3$s ]
+staff.checkout_column_label_service=Service
 staff.acp_label_barcode=Barcode
 staff.acp_label_call_number=Call Number
 staff.acp_label_circ_as_type=Circulate As Type

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

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


hooks/post-receive
-- 
Evergreen ILS