From 7db5765e222c6d84bfe33dd7258c8ffe61d4be12 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 9 Aug 2005 07:06:19 +0000
Subject: create lang::write_and_install() which takes a $do_pkgs

---
 perl-install/standalone/finish-install |  2 +-
 perl-install/standalone/localedrake    | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'perl-install/standalone')

diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index ac904f8ff..215756a7e 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -23,7 +23,7 @@ sub ask_language() {
     require lang;
     my $locale = lang::read();
     any::selectLanguage_and_more_standalone($in, $locale);
-    lang::write($locale);
+    lang::write_and_install($locale, $in->do_pkgs);
     lang::set($locale);
     Gtk2->set_locale;
 }
diff --git a/perl-install/standalone/localedrake b/perl-install/standalone/localedrake
index 3c379c763..c3e07093b 100644
--- a/perl-install/standalone/localedrake
+++ b/perl-install/standalone/localedrake
@@ -24,7 +24,7 @@ if (defined $klang) {
     my $locale = lang::read($>);
     $klang and $locale->{lang} = $lang;
     $kcountry and $locale->{country} = $country;
-    lang::write($locale, $>, 'dont_touch_kde_files') if $apply;
+    lang::write_and_install($locale, do_pkgs_standalone->new, $>, 'dont_touch_kde_files') if $apply;
 
     #- help KDE defaulting to the right charset
     print lang::charset2kde_charset(lang::l2charset($lang)), "\n";
@@ -38,7 +38,19 @@ $ugtk2::wm_icon = "localedrake";
 $::Wizard_title = N("LocaleDrake");
 
 any::selectLanguage_and_more_standalone($in, $locale);
-lang::write($locale, $>);
+
+if ($> && lang::IM2packages($locale)) {
+    $in->ask_warn(N("Warning"),
+		  N("You should install the following packages: %s", 
+		    join(
+			#-PO: the following is used to combine packages names. eg: "initscripts, harddrake, yudit"
+			N(", "),
+			lang::IM2packages($locale)
+		    ),
+		)
+	      );
+}
+lang::write_and_install($locale, $in->do_pkgs, $>);
 
 my $msg = N("The change is done, but to be effective you must logout");
 if (my $wm = $> && any::running_window_manager()) {
-- 
cgit v1.2.1