From 9db81e5ead064b21394c75ee9746cd825ec9954f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
Date: Tue, 30 May 2017 14:27:56 +0200
Subject: [PATCH] Bug 18682 - Translatability: Get rid of [%% in translation
 for 2 files av-build-dropbox.inc

Two files av-build-dropbox.inc has linebreaks inside template directives,
 exposing internals (comments and tt code) to translations as mentioned
in initial comment.
Translators should not be confronted with such interal code.

This patch fixes it.

To test
- Verify, that code changes make sense and have no more line breaks insied
  tt directives.
- Run QA tools in newest version (checking for line breaks inside tt
  directives)
- 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 and in aa-AA-opac-bootstrap.po

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 953504a0769a38a60f379a2e9c72bf7b71814fd0)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../prog/en/includes/av-build-dropbox.inc     | 21 +++++++------------
 .../en/includes/av-build-dropbox.inc          | 19 +++++++----------
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/av-build-dropbox.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/av-build-dropbox.inc
index 8aaf8ef7e8..e2270b858f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/av-build-dropbox.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/av-build-dropbox.inc
@@ -1,19 +1,14 @@
 [% USE AuthorisedValues %]
-[%#
-    Parameters:
-    name: the name of the select element
-    category: the authorised value category
-    default: the default authorised value to select
-    class: the CSS class of the select element
-    size: the size to use for the input (generated if the authorised value category does not exist).
-    all: add a "All" entry
-%]
+[%# Parameters: %]
+[%# name: the name of the select element %]
+[%# category: the authorised value category %]
+[%# default: the default authorised value to select %]
+[%# class: the CSS class of the select element %]
+[%#  size: the size to use for the input (generated if the authorised value category does not exist). %]
+[%# all: add a "All" entry %]
 
 [% SET avs = AuthorisedValues.GetAuthValueDropbox( category ) %]
-[% DEFAULT
-    class = ''
-    size = 20
-%]
+[% DEFAULT class = '' size = 20 %]
 
 [% IF avs %]
   <select id="[% name %]" name="[% name %]" class="[% class %]" >
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/av-build-dropbox.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/av-build-dropbox.inc
index 17c12d0ca4..917406b9a3 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/av-build-dropbox.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/av-build-dropbox.inc
@@ -1,18 +1,13 @@
 [% USE AuthorisedValues %]
-[%#
-    Parameters:
-    name: the name of the select element
-    category: the authorised value category
-    default: the default authorised value to select
-    class: the CSS class of the select element
-    size: the size to use for the input (generated if the authorised value category does not exist).
-%]
+[%# Parameters: %] 
+[%# name: the name of the select element %]
+[%# category: the authorised value category %]
+[%# default: the default authorised value to select %]
+[%# class: the CSS class of the select element %]
+[%# size: the size to use for the input (generated if the authorised value category does not exist). %]
 
 [% SET avs = AuthorisedValues.GetAuthValueDropbox( category ) %]
-[% DEFAULT
-    class = ''
-    size = 20
-%]
+[% DEFAULT class = '' size = 20 %]
 
 [% IF avs %]
   <select id="[% name %]" name="[% name %]" class="[% class %]" >
-- 
2.39.5