Moved fonts into language pack so that other languages can have

proper displays in graphs

diff --git a/lib/fonts/arial.ttf b/lang/en/fonts/default.ttf
similarity index 100%
rename from lib/fonts/arial.ttf
rename to lang/en/fonts/default.ttf

diff --git a/lib/fonts/vixar.ttf b/lib/fonts/vixar.ttf
deleted file mode 100755 (executable)
index 7e690c5..0000000
Binary files a/lib/fonts/vixar.ttf and /dev/null differ

diff --git a/lib/graphlib.php b/lib/graphlib.php
index ba75e4d0cff09176d71354d8abad2e6d0feda4cb..a78921f929e230a891fe5d0896b280e2552ceb15 100644 (file)
--- a/lib/graphlib.php
+++ b/lib/graphlib.php
@@ -45,7 +45,7 @@ class graph {
                                            //   for WINDOZE this may need to be the full path, not relative.\r
 \r
     'title'              => 'Graph Title', // text for graph title\r
-    'title_font'         => 'arial.ttf',   // title text font. don't forget to set 'path_to_fonts' above.\r
+    'title_font'         => 'default.ttf',   // title text font. don't forget to set 'path_to_fonts' above.\r
     'title_size'         =>  16,           // title text point size\r
     'title_colour'       => 'black',       // colour for title text\r
 \r
@@ -54,7 +54,7 @@ class graph {
     'y_label_right'      => '',            // if this is set then this text is printed on right axis of graph.\r
 \r
     'label_size'         =>  12,           // label text point size\r
-    'label_font'         => 'arial.ttf', // label text font. don't forget to set 'path_to_fonts' above.\r
+    'label_font'         => 'default.ttf', // label text font. don't forget to set 'path_to_fonts' above.\r
     'label_colour'       => 'gray33',      // label text colour\r
     'y_label_angle'      =>  90,           // rotation of y axis label\r
 \r
@@ -108,7 +108,7 @@ class graph {
     'zero_axis'          => 'none',        // colour to draw zero-axis, or 'none'.\r
 \r
 \r
-    'axis_font'          => 'arial.ttf', // axis text font. don't forget to set 'path_to_fonts' above.\r
+    'axis_font'          => 'default.ttf', // axis text font. don't forget to set 'path_to_fonts' above.\r
     'axis_size'          =>  12,            // axis text font size in points\r
     'axis_colour'        => 'gray33',      // colour of axis text.\r
     'y_axis_angle'       =>  0,            // rotation of axis text.\r
@@ -131,7 +131,7 @@ class graph {
                                           //   'outside-top', 'outside-bottom', 'outside-left', or 'outside-right'.\r
     'legend_offset'      =>  10,           // offset in pixels from graph or outside border.\r
     'legend_padding'     =>  5,            // padding around legend text.\r
-    'legend_font'        => 'arial.ttf',   // legend text font. don't forget to set 'path_to_fonts' above.\r
+    'legend_font'        => 'default.ttf',   // legend text font. don't forget to set 'path_to_fonts' above.\r
     'legend_size'        =>  9,            // legend text point size.\r
     'legend_colour'      => 'black',       // legend text colour.\r
     'legend_border'      => 'none',        // legend border colour, or 'none'.\r
@@ -145,8 +145,19 @@ class graph {
 \r
 // init all text - title, labels, and axis text.\r
 function init() {\r
+\r
+\r
+  /// Moodle mods:  overrides the font path\r
   global $CFG;\r
-  $this->parameter['path_to_fonts'] = $CFG->dirroot."/lib/fonts/";  // Moodle\r
+  $currlang = current_language();\r
+  $fontpath = $CFG->dirroot."/lang/$currlang/fonts/";\r
+  if (!file_exists("$fontpath"."default.ttf")) {\r
+      $fontpath = $CFG->dirroot."/lang/en/fonts/";\r
+  }\r
+  $this->parameter['path_to_fonts'] = $fontpath;\r
+  /// End Moodle mods\r
+\r
+\r
 \r
   $this->calculated['outer_border'] = $this->calculated['boundary_box'];\r
 \r