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

diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl
index 2ff546436f824008d12b8dc748b135c42f961788..38d9259f07bf7b37a2640c8ac39dcd29bbefbd9d 100644 (file)
--- 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 72a5d9dd4b23b3dd66c84c5d2a7df762811f75c4..bb5dab7cd66f8640feb026cd341e4a429d2dba74 100644 (file)
--- 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 be29a71e31533e9b4bb79da8bd91a7a35b492a01..60e9f261adc236040129e432f202bd499269d62e 100644 (file)
--- 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 38cc56cc4e390b77ddc423bd65f8d84de13aafbb..c70b06bcf49cf702c21fd02622d230e356d23405 100644 (file)
--- 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);