From ee4065f9ae0f7308387c56d1319b0b37965227c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= Date: Mon, 7 Sep 2015 20:08:41 +0200 Subject: Bug 1201041: Allow OpenType fonts as well as TrueType (.otf as well as .ttf) for graphs r=gerv a=justdave --- Bugzilla/Config/Common.pm | 4 ++-- template/en/default/admin/params/dependencygraph.html.tmpl | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Bugzilla/Config/Common.pm b/Bugzilla/Config/Common.pm index a5b32c1db..e8dfe3e9d 100644 --- 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 64a334a20..6ef25807c 100644 --- 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 checksetup.pl 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 Unifont " _ + 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 Unifont " _ "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 " _ -- cgit v1.2.1