From: lpsolit%gmail.com <>
Date: Sat, 24 May 2008 14:39:50 +0000 (+0000)
Subject: Bug 435504: Boolean charts use field descriptions from the DB, making them english... 
X-Git-Tag: bugzilla-3.2rc1~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e38f89d8e4c2ad3cd119f8eb33e6b0dedb9c025f;p=thirdparty%2Fbugzilla.git

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
---

diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 3ff80568fd..200f7d4625 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"', 
@@ -148,6 +147,13 @@
   'cumulate',
 ],
 
+'reports/duplicates.rdf.tmpl' => [
+  'template_version', 
+  'bug.id', 
+  'bug.count', 
+  'bug.delta', 
+],
+
 'reports/chart.html.tmpl' => [
   'width', 
   'height', 
diff --git a/template/en/default/search/boolean-charts.html.tmpl b/template/en/default/search/boolean-charts.html.tmpl
index 25a54a0a9b..97a10d4ab2 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>