From 1d505b299eca198af30c201f65a2cccd5dc6722e Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Fri, 28 Mar 2008 19:15:42 +0000
Subject: 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
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 checksetup.pl | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'checksetup.pl')

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',
-- 
cgit v1.2.3-24-g4f1b