Bug 1201041: Allow OpenType fonts as well as TrueType (.otf as well as .ttf) for...

r=gerv a=justdave

diff --git a/Bugzilla/Config/Common.pm b/Bugzilla/Config/Common.pm
index a5b32c1dbeef47bfac44ef35b9b19ffe4fec4d31..e8dfe3e9d1ee0ff7e5a4ee82049236a4fd49278e 100644 (file)
--- a/Bugzilla/Config/Common.pm
+++ b/Bugzilla/Config/Common.pm
@@ -249,8 +249,8 @@ sub check_font_file {
     $font = trim($font);
     return '' unless $font;
 
-    if ($font !~ /\.ttf$/) {
-        return "The file must point to a TrueType font file (its extension must be .ttf)"
+    if ($font !~ /\.(ttf|otf)$/) {
+        return "The file must point to a TrueType or OpenType font file (its extension must be .ttf or .otf)"
     }
     if (! -f $font) {
         return "The file '$font' cannot be found. Make sure you typed the full path to the file"

diff --git a/template/en/default/admin/params/dependencygraph.html.tmpl b/template/en/default/admin/params/dependencygraph.html.tmpl
index 64a334a2020956c878408f2781864fbbc1b13248..6ef25807c283a76fb0406157a2caa0681f10f2a6 100644 (file)
--- a/template/en/default/admin/params/dependencygraph.html.tmpl
+++ b/template/en/default/admin/params/dependencygraph.html.tmpl
@@ -34,10 +34,10 @@
                  for other systems the needed measures may vary. You can run <kbd>checksetup.pl</kbd>
                  to recreate the .htaccess file if it has been lost.",
 
-  font_file => "You can specify the full path to a TrueType font file which will be used " _
-               "to display text (labels, legends, ...) in charts and graphical reports. " _
-               "To support as many languages as possible, we recommend to specify a TrueType " _
-               "font such as <a href=\"http://unifoundry.com/unifont.html\">Unifont</a> " _
+  font_file => "You can specify the full path to a TrueType or OpenType font file which will " _
+               "be used to display text (labels, legends, ...) in charts and graphical reports. " _
+               "To support as many languages as possible, we recommend to specify a font " _
+               "such as <a href=\"http://unifoundry.com/unifont.html\">Unifont</a> " _
                "which supports all printable characters in the Basic Multilingual Plane. " _
                "If you leave this parameter empty, a default font will be used, but " _
                "its support is limited to English characters only and so other characters " _