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

r=gerv

diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index d9fdc0f9eaeb4298db2165a4238b04d8b0f42fcd..19797b7b8e07e4cfb3e0e7d22ca29f4c476250b7 100644 (file)
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -744,7 +744,7 @@ sub check_font_file {
     $readable = 1 if -r $font_file;
 
     my $ttf;
-    $ttf = 1 if $font_file =~ /\.ttf$/;
+    $ttf = 1 if $font_file =~ /\.(ttf|otf)$/;
 
     if ($output) {
         _checking_for({ package => 'Font file', ok => $readable && $ttf});

diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl
index d1d23020080e7754501d6235cfc07a9cbd48e637..d1bb873cad7d1e8cb2094ffbecfe18828be9881c 100644 (file)
--- a/template/en/default/setup/strings.txt.pl
+++ b/template/en/default/setup/strings.txt.pl
@@ -27,8 +27,8 @@ END
 The file ##file## cannot be found. Make sure you typed the full path to the file
 END
     bad_font_file_name => <<'END',
-The file ##file## must point to a TrueType font file (its extension must be
-.ttf)
+The file ##file## must point to a TrueType or OpenType font file
+(its extension must be .ttf or .otf).
 END
     blacklisted => '(blacklisted)',
     bz_schema_exists_before_220 => <<'END',
@@ -224,9 +224,9 @@ what directory the "diff" bin is in. (You only need to set this if you
 are using that feature of the Patch Viewer.)
 END
     localconfig_font_file => <<'END',
-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
+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 (http://unifoundry.com/unifont.html), 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