Attachment 63928 Details for Bug 18641 – Bug 18641 - Translatability: Get rid of template directives in translations for *reserves.tt files

[patch] Bug 18641 - Translatability: Get rid of template directives in translations for *reserves.tt files

Bug-18641---Translatability-Get-rid-of-template-di.patch (text/plain), 3.49 KB, created by Marcel de Rooy on 2017-06-02 09:15:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2017-06-02 09:15:10 UTC

Size: 3.49 KB

patch

obsolete

>From ae2619504703a9974faec7cae658f146841e49d1 Mon Sep 17 00:00:00 2001
>From: =?utf-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
>Date: Sat, 20 May 2017 09:18:10 +0200
>Subject: [PATCH] Bug 18641 - Translatability: Get rid of template directives
> in translations for *reserves.tt files
>Content-Type: text/plain; charset=utf-8
>
>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 <josef.moravec@gmail.com>
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> 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() {
> <input type="text" size="10" id="to" name="to" value="[% to | $KohaDates %]" class="datepickerto" />
> </li>
> </ol>
>-<p><i>(Inclusive, default is [% HoldsToPullStartDate %] days ago to [% IF ( HoldsToPullEndDate ) %][% HoldsToPullEndDate %] days ahead[% ELSE %]today[% END %], set other date ranges as needed. )</i></p>
>+[% 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 %]
>+<p><i>[%- INCLUDE range_msg -%]</i></p>
> <fieldset class="action"><input type="submit" name="run_report" value="Submit" class="submit"/></fieldset>
> </fieldset>
> </form>
>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 @@
>         <div id="holdsover">
>                 [% IF ( ReservesMaxPickUpDelay ) %]<p>Holds listed here have been awaiting pickup for more than [% ReservesMaxPickUpDelay %] days.</p>[% END %]
>                [% IF ( overloop ) %]
>-
>                <form name="cancelAllReserve" action="waitingreserves.pl" method="post">
>                    <input type="hidden" name="cancelall" value="1" />
>                    <input type="hidden" name="allbranches" value="[% allbranches %]" />
>                    <input type="hidden" name="tab" value="holdsover">
>-                   <input type="submit" value="Cancel [% IF TransferWhenCancelAllWaitingHolds %]and Transfer [% END %]All" />
>+                   [% BLOCK submit_value %][% IF TransferWhenCancelAllWaitingHolds %]Cancel and Transfer all[%ELSE%]Cancel all[% END %][% END %]
>+                   <input type="submit" value="[%- INCLUDE submit_value -%]" />
>                </form>
>                [% UNLESS TransferWhenCancelAllWaitingHolds %]
>                     Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds sypref)
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 18641: 63584 | 63608 | 63625 | 63928 | 63965 | 64078