LP#1373578: fix translatability of hold placement errors
authorGalen Charlton <gmc@esilibrary.com>
Mon, 23 May 2016 16:29:04 +0000 (12:29 -0400)
committerBen Shum <ben@evergreener.net>
Thu, 2 Jun 2016 22:00:59 +0000 (18:00 -0400)
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@esilibrary.com>
Signed-off-by: Ben Shum <ben@evergreener.net>
Open-ILS/src/templates/opac/parts/place_hold_result.tt2

index 5cf09c1..50c20dd 100644 (file)
@@ -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("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 ?
                                                     hdata.hold_failed_event.payload.fail_part ||
                                                     hdata.hold_failed_event.textcode ||
                                                     (hdata.hold_local_alert ?