Bugzilla – Attachment 63834 Details for
Bug 18693
Translatability: Get rid of exposing a [%% FOREACH loop in translation for branch-selector.inc
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18693: Translatability: Get rid of exposing a [%% FOREACH loop in translation for branch-selector.inc
Bug-18693-Translatability-Get-rid-of-exposing-a--F.patch (text/plain), 2.57 KB, created by
Marc Véron
on 2017-05-30 05:32:03 UTC
(
hide
)
Description:
Bug 18693: Translatability: Get rid of exposing a [%% FOREACH loop in translation for branch-selector.inc
Filename:
MIME Type:
Creator:
Marc Véron
Created:
2017-05-30 05:32:03 UTC
Size:
2.57 KB
patch
obsolete
>From 2ab6562d9e54eae344b14ca53e4422ec8aa20007 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch> >Date: Tue, 30 May 2017 07:13:31 +0200 >Subject: [PATCH] Bug 18693: Translatability: Get rid of exposing a [%% FOREACH > loop in translation for branch-selector.inc > >The file branch-selector.inc exposes the following line to translation >(due to newlines insied a tt directive): >%s %s [%% FOREACH branch IN branches; IF branch.selected; selectall = 0; END; END %%] > >Additionally, export.tt exposes the following line to translation: >[%% INCLUDE 'branch-selector.inc' branches = libraries %%] > >To test: >- Apply patch >- In Staff client, go to Home > Tools > Export data >- Verify that library selection behaves as before >- Bonus test: Create a "language" aa-AA (perl translate create aa-AA > from folder misc/translator, verify that lines mentioned above do > no longer appear in aa-AA-staff-prog.po >- Run QA tools (newest version with test for newlines in tt directives) >--- > koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc | 10 +++++----- > koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt | 3 +-- > 2 files changed, 6 insertions(+), 7 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc >index e6dfdb7..b91ecc2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc >@@ -1,10 +1,10 @@ > [%# First check to see if we have anything selected, otherwise we select all %] > [% selectall = 1 %] >-[% FOREACH branch IN branches; >- IF branch.selected; >- selectall = 0; >- END; >-END %] >+[% FOREACH branch IN branches %] >+ [% IF branch.selected %] >+ [% selectall = 0 %] >+ [% END %] >+[% END %] > <div class="branchselector"> > <p><a href="#" id="checkall"> <i class="fa fa-check"></i> Select all</a> | <a href="#" id="checknone"> <i class="fa fa-remove"></i> Clear all</a></p> > <div class="branchgridrow"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >index 681bddb..eb0069e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >@@ -97,8 +97,7 @@ $(document).ready(function() { > > <li> > <label>Library: </label> >- [% INCLUDE 'branch-selector.inc' >- branches = libraries %] >+ [% INCLUDE 'branch-selector.inc' branches = libraries %] > </li> > </ol> > >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 18693
:
63834
|
63992