[open-ils-commits] [GIT] Evergreen ILS branch rel_2_10 updated. 79c125c34b6591684a4c78eec4c27e011d8dc4bf

[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_10 has been updated
       via  79c125c34b6591684a4c78eec4c27e011d8dc4bf (commit)
      from  1f226dc715dd28b24643a351dd087c6fe2ac6783 (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 79c125c34b6591684a4c78eec4c27e011d8dc4bf
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Mon May 23 12:29:04 2016 -0400

    LP#1373578: fix translatability of hold placement errors
    
    This patch fixes a circumstance where ->maketext() could be
    passed an empty string, causing it to emit the PO file header text
    rather than a desired string.
    
    To test
    -------
    [1] Configure Evergreen to use a TPAC localization (e.g.,
        the Czech translation).
    [2] Enable the "Has Local Copy Alert" library setting.
    [3] In the OPAC, change locale and attempt to place a
        hold that would trigger the alert saying that there's
        already a local copy available.
    [4] Note that the alert reads as "Project-Id-Version: evergreen
        Report-Msgid-Bugs-To: ..."
    [5] Apply the patch.
    [6] Try step 3; this time the alert will be translated correctly,
        e.g., "Ve vaší domovské knihovně je již dostupný exemplář."
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Ben Shum <ben at evergreener.net>

diff --git a/Open-ILS/src/templates/opac/parts/place_hold_result.tt2 b/Open-ILS/src/templates/opac/parts/place_hold_result.tt2
index 5cf09c1..50c20dd 100644
--- a/Open-ILS/src/templates/opac/parts/place_hold_result.tt2
+++ b/Open-ILS/src/templates/opac/parts/place_hold_result.tt2
@@ -90,7 +90,7 @@
                                                     l("All available copies are temporarily unavailable at your pickup library. Placing this hold could result in longer wait times.") :
                                                     FAIL_PART_MSG_MAP.$fail_part_key ||
                                                     EVENT_MSG_MAP.$event_key ||
-                                                    l(hdata.hold_failed_event.desc) ||
+                                                    (hdata.hold_failed_event.desc ? l(hdata.hold_failed_event.desc) : '') ||
                                                     hdata.hold_failed_event.payload.fail_part ||
                                                     hdata.hold_failed_event.textcode ||
                                                     (hdata.hold_local_alert ?

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

Summary of changes:
 .../src/templates/opac/parts/place_hold_result.tt2 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS