From 73eac387a477534fea85c9063388afe1bfb1f61f Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 11 Sep 2008 10:24:34 +0000
Subject: - finish-install:   o fix setting utf8 when using lang=xx from
 /proc/cmdline (#43566)

---
 perl-install/NEWS    | 2 ++
 perl-install/lang.pm | 1 +
 2 files changed, 3 insertions(+)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 7bed8789c..37852125a 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- finish-install:
+  o fix setting utf8 when using lang=xx from /proc/cmdline (#43566)
 - services (thanks to spuk):
   o list ip6tables in "Internet" category
   o list nfs-common and nfs-server in "File sharing" category
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index bea273a31..73e4a76d5 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -1048,6 +1048,7 @@ sub lang_to_ourlocale {
     my ($lang) = @_;
 
     my $locale = system_locales_to_ourlocale($lang);
+    $locale->{utf8} ||= utf8_should_be_needed($locale);
     lang_changed($locale);
     $locale;
 }
-- 
cgit v1.2.1