From f1d1a50912deab00d94e6cd0262acaaef14dd1b7 Mon Sep 17 00:00:00 2001
From: Pasi Kallinen <pasi.kallinen@pttk.fi>
Date: Thu, 5 Sep 2013 21:37:38 +0300
Subject: [PATCH] Make translating the basic search searchbar easier.

Signed-off-by: Pasi Kallinen <pasi.kallinen@pttk.fi>
---
 Open-ILS/src/templates/opac/parts/searchbar.tt2 | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index 84d6008c76..df3745ceab 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -9,7 +9,7 @@
             id="home_adv_search_link">[% l('Advanced Search') %]</a>
         <span class="browse_the_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/browse', {}, ['fi:has_browse_entry']) %]">[% l('Browse the Catalog') %]</a></span>
     </div>
-    <div class="searchbar">[%- l('Search ');
+    <div class="searchbar">[%- control_sgroup = BLOCK;
         IF search.basic_config.type == 'attr';
             INCLUDE "opac/parts/coded_value_selector.tt2"
                 attr=search.basic_config.group none_ok=1 none_label=search.basic_config.none_label;
@@ -17,7 +17,8 @@
             INCLUDE "opac/parts/filter_group_selector.tt2"
                 filter_group=search.basic_config.group none_ok=1 none_label=search.basic_config.none_label;
         END;
-            l(' for ');
+        END;
+         control_sbox = BLOCK
         %]
         <span class='search_box_wrapper'>
             [%- # autosuggest breaks accessibility, as the aria-label
@@ -35,12 +36,12 @@
                     [% IF basic_search != "f" %] autofocus [% END %] x-webkit-speech
                 [%- END # autosuggest enabled %] />
         </span>
-        [%- 
+        [%- END;
             select_lib_label = l("Select search library");
-            INCLUDE "opac/parts/qtype_selector.tt2" id="qtype";
-            l(' in ');
-            INCLUDE build_org_selector arialabel=select_lib_label show_loc_groups=1
-        -%]
+            control_qtype = INCLUDE "opac/parts/qtype_selector.tt2" id="qtype";
+            control_locg = INCLUDE build_org_selector arialabel=select_lib_label show_loc_groups=1;
+	-%]
+	[%- l('Search [_1] for [_2] [_3] in [_4]', control_sgroup, control_sbox, control_qtype, control_locg); -%]
     <span>
         <input id='search-submit-go' type="submit" value="[% l('Search') %]" alt="[% l('Search') %]" class="opac-button"
             onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden"}, 2000)'/>
-- 
2.11.0