From 7a87b57fc40d82693b046960876f16eeab0bb148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20V=C3=A9ron?= Date: Sat, 20 May 2017 09:18:10 +0200 Subject: [PATCH] [SIGNED-OFF] Bug 18641 - Translatability: Get rid of template directives in translations for *reserves.tt files Template directives should not be exposed in translation, but lines like the following pop up in the translation tool: Cancel [% IF TransferWhenCancelAllWaitingHolds %]and Transfer [% END %] All This patch fixes it. To test: - Apply patch - Verify that code changes make sense - Verify that submit buttons of pendingreserves.tt and waitingreserves.tt still work and display the same string as before Signed-off-by: Josef Moravec --- koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt | 3 ++- koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt index 7017465..530c244 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt @@ -195,7 +195,8 @@ $(document).ready(function() { -

(Inclusive, default is [% HoldsToPullStartDate %] days ago to [% IF ( HoldsToPullEndDate ) %][% HoldsToPullEndDate %] days ahead[% ELSE %]today[% END %], set other date ranges as needed. )

+[% BLOCK range_msg %](Inclusive, default is [% HoldsToPullStartDate %] days ago to [% IF ( HoldsToPullEndDate ) %][% HoldsToPullEndDate %] days ahead[% ELSE %]today[% END %], set other date ranges as needed.)[% END %] +

[%- INCLUDE range_msg -%]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt index 80af602..c8695e6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -137,12 +137,12 @@
[% IF ( ReservesMaxPickUpDelay ) %]

Holds listed here have been awaiting pickup for more than [% ReservesMaxPickUpDelay %] days.

[% END %] [% IF ( overloop ) %] -
- + [% BLOCK submit_value %][% IF TransferWhenCancelAllWaitingHolds %]Cancel and Transfer all[%ELSE%]Cancel all[% END %][% END %] +
[% UNLESS TransferWhenCancelAllWaitingHolds %] Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds sypref) -- 2.1.4