summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-08-09 07:06:19 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-08-09 07:06:19 +0000
commit7db5765e222c6d84bfe33dd7258c8ffe61d4be12 (patch)
tree2931ec6f2bb94eb83d7994e47f958576e083e451 /perl-install/standalone
parent341632802a32dbc7924a82035ae34a1b73e58b37 (diff)
downloaddrakx-backup-do-not-use-7db5765e222c6d84bfe33dd7258c8ffe61d4be12.tar
drakx-backup-do-not-use-7db5765e222c6d84bfe33dd7258c8ffe61d4be12.tar.gz
drakx-backup-do-not-use-7db5765e222c6d84bfe33dd7258c8ffe61d4be12.tar.bz2
drakx-backup-do-not-use-7db5765e222c6d84bfe33dd7258c8ffe61d4be12.tar.xz
drakx-backup-do-not-use-7db5765e222c6d84bfe33dd7258c8ffe61d4be12.zip
create lang::write_and_install() which takes a $do_pkgs
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/finish-install2
-rw-r--r--perl-install/standalone/localedrake16
2 files changed, 15 insertions, 3 deletions
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()) {