Bug 296180: Table and CSV reports should use localised terms for statuses and resolutions - Patch by Emmanuel Seyman <eseyman@linagora.com> - r/a=myk

webtools/bugzilla/template/en/default/reports/report-table.csv.tmpl

@@ -43,14 +43,26 @@
 [% title %],
 [% IF col_field -%]
 [% FOREACH col = col_names -%]
+  [% IF col_field == 'bug_status' %]
+    [% status_descs.$col FILTER csv -%]
+  [% ELSIF col_field == 'resolution' %]
+    [% resolution_descs.$col FILTER csv -%]
+  [% ELSE %]
     [% col FILTER csv -%],
+  [% END %]
 [% END -%]
 [% ELSE -%]
   [% num_bugs %],
 [% END %]
 
 [% FOREACH row = row_names %]
+[% IF row_field == 'bug_status' %]
+    [% status_descs.$row FILTER csv -%]
+  [% ELSIF row_field == 'resolution' %]
+    [% resolution_descs.$row FILTER csv -%]
+  [% ELSE %]
     [% row FILTER csv -%],
+  [% END %]
   [% FOREACH col = col_names %]
     [% IF data.$tbl AND data.$tbl.$col AND data.$tbl.$col.$row %]
       [% data.$tbl.$col.$row -%],

webtools/bugzilla/template/en/default/reports/report-table.html.tmpl

@@ -85,7 +85,13 @@
         
         [% col_idx = 1 - col_idx %]
         <td class="[% classes.$row_idx.$col_idx %]">
+          [% IF col_field == 'bug_status' %]
+            [% status_descs.$col FILTER html FILTER replace('^ $','&nbsp;') %]
+          [% ELSIF col_field == 'resolution' %]
+            [% resolution_descs.$col FILTER html FILTER replace('^ $','&nbsp;') %]
+          [% ELSE %]
             [% col FILTER html FILTER replace('^ $','&nbsp;') %]
+          [% END %]
         </td>
       [% END %]
       <td class="ttotal">
@@ -100,7 +106,13 @@
     [% row_idx = 1 - row_idx %]
     <tr>
       <td class="[% classes.$row_idx.$col_idx %]" align="right">
+        [% IF row_field == 'bug_status' %]
+          [% status_descs.$row FILTER html FILTER replace('^ $','&nbsp;') %]
+        [% ELSIF row_field == 'resolution' %]
+          [% resolution_descs.$row FILTER html FILTER replace('^ $','&nbsp;') %]
+        [% ELSE %]
           [% row FILTER html FILTER replace('^ $','&nbsp;') %]
+        [% END %]
       </td>
       [% FOREACH col = col_names %]
         [% row_total = row_total + data.$tbl.$col.$row %]