summaryrefslogtreecommitdiffstats
path: root/template/en/default/reports
diff options
context:
space:
mode:
authorlpsolit%gmail.com <>2005-06-15 07:43:11 +0200
committerlpsolit%gmail.com <>2005-06-15 07:43:11 +0200
commit871d4b12d78c58fdb7151ade2d1b9c87faad27b2 (patch)
treead87c98df1d1f47cd704a16c39aa668aad98ec66 /template/en/default/reports
parent61ffaf7db92f2022556def1a0e864c26bbbc410c (diff)
downloadbugzilla-871d4b12d78c58fdb7151ade2d1b9c87faad27b2.tar.gz
bugzilla-871d4b12d78c58fdb7151ade2d1b9c87faad27b2.tar.xz
Bug 296180: Table and CSV reports should use localised terms for statuses and resolutions - Patch by Emmanuel Seyman <eseyman@linagora.com> - r/a=myk
Diffstat (limited to 'template/en/default/reports')
-rw-r--r--template/en/default/reports/report-table.csv.tmpl16
-rw-r--r--template/en/default/reports/report-table.html.tmpl16
2 files changed, 28 insertions, 4 deletions
diff --git a/template/en/default/reports/report-table.csv.tmpl b/template/en/default/reports/report-table.csv.tmpl
index 216419fea..42fcd6686 100644
--- a/template/en/default/reports/report-table.csv.tmpl
+++ b/template/en/default/reports/report-table.csv.tmpl
@@ -43,14 +43,26 @@
[% title %],
[% IF col_field -%]
[% FOREACH col = col_names -%]
- [% col FILTER csv -%],
+ [% 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 %]
- [% row FILTER csv -%],
+[% 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 -%],
diff --git a/template/en/default/reports/report-table.html.tmpl b/template/en/default/reports/report-table.html.tmpl
index 3c90d5bf2..0e2ae62c8 100644
--- a/template/en/default/reports/report-table.html.tmpl
+++ b/template/en/default/reports/report-table.html.tmpl
@@ -85,7 +85,13 @@
[% col_idx = 1 - col_idx %]
<td class="[% classes.$row_idx.$col_idx %]">
- [% col FILTER html FILTER replace('^ $','&nbsp;') %]
+ [% 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">
- [% row FILTER html FILTER replace('^ $','&nbsp;') %]
+ [% 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 %]