From 993a1c53229e174d4c2bd1d67acef6363c12db50 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Sat, 24 May 2008 14:34:55 +0000
Subject: Bug 435504: Boolean charts use field descriptions from the DB, making
 them english only - Patch by Frédéric Buclin <LpSolit@gmail.com> r/a=mkanat
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/en/default/filterexceptions.pl             | 3 +--
 template/en/default/search/boolean-charts.html.tmpl | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'template/en/default')

diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 3ff80568f..a02c644ef 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -62,8 +62,7 @@
   '"value${chartnum}-${rownum}-${colnum}"', 
   '"type${chartnum}-${rownum}-${colnum}"', 
   'field.name', 
-  'field.description', 
-  'type.name', 
+  'type.name',
   'type.description', 
   '"${chartnum}-${rownum}-${newor}"', 
   '"${chartnum}-${newand}-0"', 
diff --git a/template/en/default/search/boolean-charts.html.tmpl b/template/en/default/search/boolean-charts.html.tmpl
index 25a54a0a9..97a10d4ab 100644
--- a/template/en/default/search/boolean-charts.html.tmpl
+++ b/template/en/default/search/boolean-charts.html.tmpl
@@ -74,8 +74,9 @@
       <td>
         <select name="[% "field${chartnum}-${rownum}-${colnum}" %]">
           [% FOREACH field = fields %]
-            <option value="[% field.name %]"
-              [%- " selected" IF field.name == col.field %]>[% field.description %]</option>
+            <option value="[% field.name %]" [% "selected" IF field.name == col.field %]>
+              [% field_descs.${field.name} || field.description FILTER html %]
+            </option>
           [% END %]
         </select>
 
-- 
cgit v1.2.3-24-g4f1b