Bug 425288: checksetup.pl displays messages using the first language available, alphabetically, rather than falling back to english if the desired language is not found - Patch by Frédéric Buclin <LpSolit@gmail.com> r=wurblzap a=mkanat

1 files changed, 2 insertions, 3 deletions

diff --git a/checksetup.pl b/checksetup.pl
index b8f9e325b..d624c8775 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -47,14 +47,13 @@ use 5.008001;
 use File::Basename;
 use Getopt::Long qw(:config bundling);
 use Pod::Usage;
-use POSIX qw(setlocale LC_CTYPE);
 use Safe;
 
 BEGIN { chdir dirname($0); }
 use lib qw(. lib);
 use Bugzilla::Constants;
 use Bugzilla::Install::Requirements;
-use Bugzilla::Install::Util qw(install_string get_version_and_os);
+use Bugzilla::Install::Util qw(install_string get_version_and_os get_console_locale);
 
 ######################################################################
 # Live Code
@@ -62,7 +61,7 @@ use Bugzilla::Install::Util qw(install_string get_version_and_os);
 
 # When we're running at the command line, we need to pick the right
 # language before ever displaying any string.
-$ENV{'HTTP_ACCEPT_LANGUAGE'} ||= setlocale(LC_CTYPE);
+$ENV{'HTTP_ACCEPT_LANGUAGE'} ||= get_console_locale();
 
 my %switch;
 GetOptions(\%switch, 'help|h|?', 'check-modules', 'no-templates|t',