diff options
| author | Frédéric Buclin <LpSolit@gmail.com> | 2015-09-07 20:06:56 +0200 |
|---|---|---|
| committer | Frédéric Buclin <LpSolit@gmail.com> | 2015-09-07 20:06:56 +0200 |
| commit | 9323c5ee46fbcb5dfd508ef382961a4820626889 (patch) | |
| tree | 13b3a1f397e2d9e0fe7fcdd3af006879924a42d7 | |
| parent | 23807179790108fc2575d06df59dbaebf8ce0af8 (diff) | |
| download | bugzilla-9323c5ee46fbcb5dfd508ef382961a4820626889.tar.gz bugzilla-9323c5ee46fbcb5dfd508ef382961a4820626889.tar.xz | |
Bug 1201041: Allow OpenType fonts as well as TrueType (.otf as well as .ttf) for graphs
r=gerv
| -rw-r--r-- | Bugzilla/Install/Requirements.pm | 2 | ||||
| -rw-r--r-- | template/en/default/setup/strings.txt.pl | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm index d9fdc0f9e..19797b7b8 100644 --- 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 d1d230200..d1bb873ca 100644 --- 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 |