Bug 298220: Graphs should use localised terms for statuses and resolutions -…

template/en/default/global/field-descs.none.tmpl

@@ -85,5 +85,6 @@
                         "DUPLICATE"  => "DUPLICATE",
                         "WORKSFORME" => "WORKSFORME",
                         "MOVED"      => "MOVED",
-                        "---"        => "---" } %]
+                        "---"        => "---",
+                        " "          => " " } %]
 

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

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") %]

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