From 3e4bed239348cf5af0c70c3ab6315c0f24044959 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Wed, 6 Nov 2013 15:08:45 +0100
Subject: Bug 287682: UTF-8 characters are incorrectly displayed in New Charts
 and graphical reports r=wurblzap a=sgreen

---
 template/en/default/reports/report-bar.png.tmpl | 28 ++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'template/en/default/reports/report-bar.png.tmpl')

diff --git a/template/en/default/reports/report-bar.png.tmpl b/template/en/default/reports/report-bar.png.tmpl
index 70d482ec9..d879f6dd1 100644
--- a/template/en/default/reports/report-bar.png.tmpl
+++ b/template/en/default/reports/report-bar.png.tmpl
@@ -6,10 +6,6 @@
   # defined by the Mozilla Public License, v. 2.0.
   #%]
 
-[% y_label = "$terms.Bugs" %]
-
-[% col_field_disp = field_descs.$col_field || col_field %]
-
 [% FOR i IN [ 0 .. data.0.0.max ] %]
   [% data.0.0.$i = display_value(col_field, data.0.0.$i) %]
 [% END %]
@@ -21,8 +17,8 @@
 [% FILTER null;
   USE graph = GD.Graph.bars(width, height);
 
-  graph.set(x_label           => col_field_disp,
-            y_label           => y_label,
+  graph.set(x_label           => field_descs.$col_field || col_field,
+            y_label           => terms.Bugs,
             y_tick_number     => 8,
             y_number_format   => "%d",
             x_label_position  => 0.5,
@@ -36,13 +32,17 @@
   graph.set(cumulate          => "true",
             show_values       => 0) IF cumulate;
 
-  # Workaround for the fact that set_legend won't take row_names directly,
-  # because row_names is an array reference rather than an array.
-  graph.set_legend(row_names.0, row_names.1, row_names.2, row_names.3,
-                   row_names.4, row_names.5, row_names.6, row_names.7,
-                   row_names.8, row_names.9, row_names.10, row_names.11,
-                   row_names.12, row_names.13, row_names.14, row_names.15);
-
-  graph.plot(data.0).png | stdout(1);
+  graph.set_legend(row_names);
   END;
 -%]
+
+[% IF Param("font_file") %]
+  [% graph.set_x_axis_font(Param("font_file"), 9);
+     graph.set_x_label_font(Param("font_file"), 10);
+     graph.set_y_axis_font(Param("font_file"), 9);
+     graph.set_y_label_font(Param("font_file"), 10);
+     graph.set_legend_font(Param("font_file"), 9);
+  %]
+[% END %]
+
+[% graph.plot(data.0).png | stdout(1) %]
-- 
cgit v1.2.3-24-g4f1b