[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. 12cab0be2f084c0f03c2c8b223fe3e53d0421329

[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, rel_2_1 has been updated
       via  12cab0be2f084c0f03c2c8b223fe3e53d0421329 (commit)
       via  8aa2bd571354b0187794559536e93b5a135dc9df (commit)
      from  5d169df87671cf34086c9f2ce354f6636b13b580 (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 12cab0be2f084c0f03c2c8b223fe3e53d0421329
Author: Dan Scott <dan at coffeecode.net>
Date:   Sat Jun 2 20:06:30 2012 -0400

    Distinguish route-to-cataloging exception circ messages
    
    It appears as though a copy-and-paste error introduced duplicate keys in
    circ.properties, which in turn makes newer versions of the Translate
    Toolkit unhappy and results in empty translated files. Tracing through
    the pertinent code in xul/staff_client/server/circ/util.js, it looks
    like the desired key was for "not_found" for the second "cataloging" key
    - so change that accordingly.
    
    Signed-off-by: Dan Scott <dan at coffeecode.net>
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>

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 423ec85..83a54f4 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
@@ -423,7 +423,7 @@ staff.circ.work_log_checkin_attempt.reservation_shelf.message=%1$s attempted che
 # 1 - Staff Username  2 - Patron Family  3 - Patron Barcode  4 - Item Barcode  5 - Route To text
 staff.circ.work_log_checkin_attempt.cataloging.message=%1$s attempted checkin of %4$s, which is a pre-cat and was routed to Cataloging.  Route To = %5$s
 # 1 - Staff Username  2 - Patron Family  3 - Patron Barcode  4 - Item Barcode  5 - Route To text
-staff.circ.work_log_checkin_attempt.cataloging.message=%1$s attempted checkin of %4$s, which was not found, and so was routed to Cataloging.  Route To = %5$s
+staff.circ.work_log_checkin_attempt.not_found.message=%1$s attempted checkin of %4$s, which was not found, and so was routed to Cataloging.  Route To = %5$s
 staff.circ.checkin.hold_capture=Hold Capture
 staff.circ.checkin.check_in.tab=Item Check In
 staff.circ.renew.tab.label=Renew Items

commit 8aa2bd571354b0187794559536e93b5a135dc9df
Author: Dan Scott <dan at coffeecode.net>
Date:   Sat Jun 2 19:51:55 2012 -0400

    Fix check for duplicate strings in i18n properties
    
    We had the core of the check in place - just failed to check the
    property we were iterating over. Doh.
    
    Signed-off-by: Dan Scott <dan at coffeecode.net>
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>

diff --git a/build/i18n/tests/check_properties.py b/build/i18n/tests/check_properties.py
index 410781e..8fc9b86 100755
--- a/build/i18n/tests/check_properties.py
+++ b/build/i18n/tests/check_properties.py
@@ -93,8 +93,9 @@ def parse_properties():
                 continue
 
             for entry in properties[prop_key]:
-                if ['file'] == short_pf:
-                    print("%s:%d: Duplicate key '%s' in line [%s]" % (short_pf, line_num, prop_key, line[0:-1]))
+                if entry['file'] == short_pf:
+                    print("File: %s:%d"% (short_pf, line_num))
+                    print("\tDuplicate key '%s' in line [%s]" % (prop_key, line[0:-1]))
                     continue
 
             properties[prop_key].append({'value': value, 'file': short_pf})

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

Summary of changes:
 .../server/locale/en-US/circ.properties            |    2 +-
 build/i18n/tests/check_properties.py               |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS