aboutsummaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorMax Kanat-Alexander <mkanat@bugzilla.org>2010-07-01 14:00:29 -0700
committerMax Kanat-Alexander <mkanat@bugzilla.org>2010-07-01 14:00:29 -0700
commit71f44e682fe7b0f68d3a6a609aa5321c081c3fcc (patch)
treed904831de052af5653cf99239a51a4b14e081959 /Bugzilla
parentcbbcceb2a69d48737fac00639421d53f92c61c64 (diff)
downloadbugs-71f44e682fe7b0f68d3a6a609aa5321c081c3fcc.tar
bugs-71f44e682fe7b0f68d3a6a609aa5321c081c3fcc.tar.gz
bugs-71f44e682fe7b0f68d3a6a609aa5321c081c3fcc.tar.bz2
bugs-71f44e682fe7b0f68d3a6a609aa5321c081c3fcc.tar.xz
bugs-71f44e682fe7b0f68d3a6a609aa5321c081c3fcc.zip
Bug 382398: Make checksetup.pl localized messages be output in the
console's charset r=timello, a=mkanat
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/Install/Requirements.pm4
-rw-r--r--Bugzilla/Install/Util.pm36
2 files changed, 39 insertions, 1 deletions
diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index 00077a5a9..12a9c20c5 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -541,6 +541,10 @@ sub have_vers {
my $wanted = $params->{version};
eval "require $module;";
+ # Don't let loading a module change the output-encoding of STDOUT
+ # or STDERR. (CGI.pm tries to set "binmode" on these file handles when
+ # it's loaded, and other modules may do the same in the future.)
+ Bugzilla::Install::Util::set_output_encoding();
# VERSION is provided by UNIVERSAL::, and can be called even if
# the module isn't loaded.
diff --git a/Bugzilla/Install/Util.pm b/Bugzilla/Install/Util.pm
index 7779f6bda..1e5a7b5e1 100644
--- a/Bugzilla/Install/Util.pm
+++ b/Bugzilla/Install/Util.pm
@@ -28,11 +28,13 @@ use strict;
use Bugzilla::Constants;
+use Encode;
use File::Basename;
use POSIX qw(setlocale LC_CTYPE);
use Safe;
use Scalar::Util qw(tainted);
use Term::ANSIColor qw(colored);
+use PerlIO;
use base qw(Exporter);
our @EXPORT_OK = qw(
@@ -47,7 +49,6 @@ our @EXPORT_OK = qw(
include_languages
template_include_path
vers_cmp
- get_console_locale
init_console
);
@@ -569,11 +570,44 @@ sub get_console_locale {
return $locale;
}
+sub set_output_encoding {
+ # If we've already set an encoding layer on STDOUT, don't
+ # add another one.
+ my @stdout_layers = PerlIO::get_layers(STDOUT);
+ return if grep(/^encoding/, @stdout_layers);
+
+ my $encoding;
+ if (ON_WINDOWS and eval { require Win32::Console }) {
+ # Although setlocale() works on Windows, it doesn't always return
+ # the current *console's* encoding. So we use OutputCP here instead,
+ # when we can.
+ $encoding = Win32::Console::OutputCP();
+ }
+ else {
+ my $locale = setlocale(LC_CTYPE);
+ if ($locale =~ /\.([^\.]+)$/) {
+ $encoding = $1;
+ }
+ }
+ $encoding = "cp$encoding" if ON_WINDOWS;
+
+ $encoding = Encode::resolve_alias($encoding) if $encoding;
+ if ($encoding and $encoding !~ /utf-8/i) {
+ binmode STDOUT, ":encoding($encoding)";
+ binmode STDERR, ":encoding($encoding)";
+ }
+ else {
+ binmode STDOUT, ':utf8';
+ binmode STDERR, ':utf8';
+ }
+}
+
sub init_console {
eval { ON_WINDOWS && require Win32::Console::ANSI; };
$ENV{'ANSI_COLORS_DISABLED'} = 1 if ($@ || !-t *STDOUT);
$SIG{__DIE__} = \&_console_die;
prevent_windows_dialog_boxes();
+ set_output_encoding();
}
sub _console_die {