From 552af02c9f4e800d49334e3b87f50bb76da7bba8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
Date: Thu, 29 Jun 2017 15:22:54 +0200
Subject: [PATCH] Bug 18654 - Translatability: Get rid of tt directives
 starting with [%% in translation for itemsearch.tt

This patch removes entries like the following in translations of itemsearch.tt:
"[%% INCLUDE form_field_select name=\"homebranch\" options = branches "
"empty_option = \"All libraries\" %%] [%% INCLUDE form_field_select name="
"\"holdingbranch\" options = branches empty_option = \"All libraries\" %%] %s "
"[%% INCLUDE form_field_select name=\"location\" options = locations "
"empty_option = \"All locations\" %%] %s "

New patch on top of Bug 18633 that resolves parts of initial comment.

To test:
- Verify that in itemsearch.tt no tt directives are splitted by new lines
  (search for [% INCLUDE )
- Verify that itemsearch.tt works as before

Followed test plan and verified that tt directives are not split by new
lines, the changes to the fieldset tags in comment 3 have been removed
and itemtype.tt still works correctly as before

Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Mason James <mtj@kohaaloha.com>
---
 .../prog/en/modules/catalogue/itemsearch.tt   | 31 ++++---------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
index 6960ebef26..e8f554fd0f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
@@ -384,36 +384,17 @@
               </fieldset>
           </div>
           <fieldset>
-            [% INCLUDE form_field_select
-              name="homebranch"
-              options = branches
-              empty_option = "All libraries"
-            %]
+            [% INCLUDE form_field_select name="homebranch" options = branches empty_option = "All libraries" %]
+            [% INCLUDE form_field_select name="holdingbranch" options = branche empty_option = "All libraries" %]
             [% IF locations.size %]
-                [% INCLUDE form_field_select
-                  name="location"
-                  options = locations
-                  empty_option = "All locations"
-                %]
+                [% INCLUDE form_field_select name="location" options = locations empty_option = "All locations" %]
             [% END %]
           </fieldset>
           <fieldset>
-            [% INCLUDE form_field_select
-              name="itype"
-              options = itemtypes
-              empty_option = "All item types"
-            %]
-            [% INCLUDE form_field_select
-              name="ccode"
-              options = ccodes
-              empty_option = "All collection codes"
-            %]
+            [% INCLUDE form_field_select name="itype" options = itemtypes empty_option = "All item types" %]
+            [% INCLUDE form_field_select name="ccode" options = ccodes empty_option = "All collection codes" %]
             [% IF notforloans.size %]
-                [% INCLUDE form_field_select
-                  name="notforloan"
-                  options = notforloans
-                  empty_option = "All statuses"
-                %]
+                [% INCLUDE form_field_select name="notforloan" options = notforloans empty_option = "All statuses" %]
             [% END %]
           </fieldset>
           <fieldset>
-- 
2.20.1