Bug 389517: CSV export gives resolution and status in English - Patch by Emmanuel...

diff --git a/template/en/default/list/list.csv.tmpl b/template/en/default/list/list.csv.tmpl
index 76df4f4da72b9a78e74cd1ff131f590913fa3e81..41750880c8f4fd6f1e4baa28abb2cb65d7b4288d 100644 (file)
--- a/template/en/default/list/list.csv.tmpl
+++ b/template/en/default/list/list.csv.tmpl
@@ -20,7 +20,7 @@
   #                 Gervase Markham <gerv@gerv.net>
   #%]
 
-[% PROCESS global/variables.none.tmpl %]
+[% PROCESS "global/field-descs.none.tmpl" %]
 [% USE date %]
 
 [% colsepchar = user.settings.csv_colsepchar.value %]
@@ -37,6 +37,10 @@ bug_id
       [% IF column == "opendate" OR column == "changeddate" %]
         [% rawcolumn = column.replace("date", "time") %]
         [% bug.$column = date.format(bug.$rawcolumn, "%Y-%m-%d %H:%M:%S") %]
+      [% ELSIF column == 'bug_status' %]
+        [% bug.$column = status_descs.${bug.$column} %]
+      [% ELSIF column == 'resolution' %]
+        [%- bug.$column = get_resolution(bug.$column) %]
       [% END %]
       [% bug.$column FILTER csv %]
     [% END %]