Bug 298220: Graphs should use localised terms for statuses and resolutions - Patch by Emmanuel Seyman <eseyman@linagora.com> r=gerv,wurblzap a=myk

4 files changed, 62 insertions, 1 deletions

diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl
index 2ff546436..38d9259f0 100644
--- a/template/en/default/global/field-descs.none.tmpl
+++ b/template/en/default/global/field-descs.none.tmpl
@@ -85,5 +85,6 @@
                         "DUPLICATE"  => "DUPLICATE",
                         "WORKSFORME" => "WORKSFORME",
                         "MOVED"      => "MOVED",
-                        "---"        => "---" } %]
+                        "---"        => "---",
+                        " "          => " " } %]
 
diff --git a/template/en/default/reports/report-bar.png.tmpl b/template/en/default/reports/report-bar.png.tmpl
index 72a5d9dd4..bb5dab7cd 100644
--- a/template/en/default/reports/report-bar.png.tmpl
+++ b/template/en/default/reports/report-bar.png.tmpl
@@ -27,6 +27,30 @@
 
 [% col_field_disp = field_descs.$col_field || col_field %]
 
+[% IF col_field == 'bug_status' %]
+  [% FOR i IN [ 0 .. data.0.0.max ] %]
+    [% data.0.0.$i = status_descs.${data.0.0.$i} %]
+  [% END %]
+[% END %]
+
+[% IF col_field == 'resolution' %]
+  [% FOR i IN [ 0 .. data.0.0.max ] %]
+    [% data.0.0.$i = resolution_descs.${data.0.0.$i} %]
+  [% END %]
+[% END %]
+
+[% IF row_field == 'bug_status' %]
+  [% FOR i IN [ 0 .. row_names.max ] %]
+    [% row_names.$i = status_descs.${row_names.$i} %]
+  [% END %]
+[% END %]
+
+[% IF row_field == 'resolution' %]
+  [% FOR i IN [ 0 .. row_names.max ] %]
+    [% row_names.$i = resolution_descs.${row_names.$i} %]
+  [% END %]
+[% END %]
+
 [% FILTER null;
   USE graph = GD.Graph.bars(width, height);
 
diff --git a/template/en/default/reports/report-line.png.tmpl b/template/en/default/reports/report-line.png.tmpl
index be29a71e3..60e9f261a 100644
--- a/template/en/default/reports/report-line.png.tmpl
+++ b/template/en/default/reports/report-line.png.tmpl
@@ -27,6 +27,30 @@
 
 [% col_field_disp = field_descs.$col_field || col_field %]
 
+[% IF col_field == 'bug_status' %]
+  [% FOR i IN [ 0 .. data.0.0.max ] %]
+    [% data.0.0.$i = status_descs.${data.0.0.$i} %]
+  [% END %]
+[% END %]
+
+[% IF col_field == 'resolution' %]
+  [% FOR i IN [ 0 .. data.0.0.max ] %]
+    [% data.0.0.$i = resolution_descs.${data.0.0.$i} %]
+  [% END %]
+[% END %]
+
+[% IF row_field == 'bug_status' %]
+  [% FOR i IN [ 0 .. row_names.max ] %]
+    [% row_names.$i = status_descs.${row_names.$i} %]
+  [% END %]
+[% END %]
+
+[% IF row_field == 'resolution' %]
+  [% FOR i IN [ 0 .. row_names.max ] %]
+    [% row_names.$i = resolution_descs.${row_names.$i} %]
+  [% END %]
+[% END %]
+
 [% IF cumulate %]
   [% USE graph = GD.Graph.area(width, height) %]
   [% graph.set(cumulate => "true") %]
diff --git a/template/en/default/reports/report-pie.png.tmpl b/template/en/default/reports/report-pie.png.tmpl
index 38cc56cc4..c70b06bcf 100644
--- a/template/en/default/reports/report-pie.png.tmpl
+++ b/template/en/default/reports/report-pie.png.tmpl
@@ -23,6 +23,18 @@
 
 [% col_field_disp = field_descs.$col_field || col_field %]
 
+[% IF col_field == 'bug_status' %]
+  [% FOR i IN [ 0 .. data.0.0.max ] %]
+    [% data.0.0.$i = status_descs.${data.0.0.$i} %]
+  [% END %]
+[% END %]
+
+[% IF col_field == 'resolution' %]
+  [% FOR i IN [ 0 .. data.0.0.max ] %]
+    [% data.0.0.$i = resolution_descs.${data.0.0.$i} %]
+  [% END %]
+[% END %]
+
 [% FILTER null;
   USE graph = GD.Graph.pie(width, height);