From 7598440a05d9057256fb5f06a4b5c796e5975b56 Mon Sep 17 00:00:00 2001
From: Jared Camins-Esakov <jcamins@cpbibliography.com>
Date: Mon, 20 Aug 2012 08:30:17 -0400
Subject: [PATCH] Bug 8332 follow-up: make strings translatable
Content-Type: text/plain; charset="UTF-8"

I made a silly mistake on the original patch and made the options
untranslatable. This follow-up restores their translatability.
---
 .../prog/en/includes/auth-finder-search.inc        |   22 ++++++++++----------
 .../intranet-tmpl/prog/en/includes/form-blocks.inc |    6 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
index 4114dfc..7bffbc5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
@@ -179,17 +179,17 @@ function finderjumpfull(page)
                 <label for="relationship">Special relationship: </label>
                 <select name="relationship" id="relationship">
                     [% selected=relationship %]
-                    [% PROCESS selectoption value='' text='None specified' %]
-                    [% PROCESS selectoption value='a' text='a - Earlier heading' %]
-                    [% PROCESS selectoption value='b' text='b - Later heading' %]
-                    [% PROCESS selectoption value='d' text='d - Acronym' %]
-                    [% PROCESS selectoption value='f' text='f - Musical composition' %]
-                    [% PROCESS selectoption value='g' text='g - Broader term' %]
-                    [% PROCESS selectoption value='h' text='h - Narrower term' %]
-                    [% PROCESS selectoption value='i' text='i - Reference instruction phrase in subfield $i' %]
-                    [% PROCESS selectoption value='n' text='n - Not applicable' %]
-                    [% PROCESS selectoption value='r' text='r - Relationship designation in $i or $4' %]
-                    [% PROCESS selectoption value='t' text='t - Immediate parent body' %]
+                    [% PROCESS selectoptionopen value='' %]None specified</option>
+                    [% PROCESS selectoptionopen value='a' %]a - Earlier heading</option>
+                    [% PROCESS selectoptionopen value='b' %]b - Later heading</option>
+                    [% PROCESS selectoptionopen value='d' %]d - Acronym</option>
+                    [% PROCESS selectoptionopen value='f' %]f - Musical composition</option>
+                    [% PROCESS selectoptionopen value='g' %]g - Broader term</option>
+                    [% PROCESS selectoptionopen value='h' %]h - Narrower term</option>
+                    [% PROCESS selectoptionopen value='i' %]i - Reference instruction phrase in subfield $i</option>
+                    [% PROCESS selectoptionopen value='n' %]n - Not applicable</option>
+                    [% PROCESS selectoptionopen value='r' %]r - Relationship designation in $i or $4</option>
+                    [% PROCESS selectoptionopen value='t' %]t - Immediate parent body</option>
                 </select>
             </li>
             </ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/form-blocks.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/form-blocks.inc
index 4999eec..8c307d5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/form-blocks.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/form-blocks.inc
@@ -1,5 +1,5 @@
-[% BLOCK selectoption %]
-    [% IF value == selected %]<option value='[% value %]' selected='selected'>[% text %]</option>
-    [% ELSE %]<option value='[% value %]'>[% text %]</option>
+[% BLOCK selectoptionopen %]
+    [% IF value == selected %]<option value='[% value %]' selected='selected'>
+    [% ELSE %]<option value='[% value %]'>
     [% END %]
 [% END %]
-- 
1.7.2.5