diff options
Diffstat (limited to 'perl-install/standalone/localedrake')
| -rwxr-xr-x[-rw-r--r--] | perl-install/standalone/localedrake | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/perl-install/standalone/localedrake b/perl-install/standalone/localedrake index 75c7bed28..231c528ea 100644..100755 --- a/perl-install/standalone/localedrake +++ b/perl-install/standalone/localedrake @@ -34,28 +34,24 @@ if (defined $klang) { my $locale = lang::read($>); my $in = 'interactive'->vnew; -$ugtk2::wm_icon = "localedrake"; +$ugtk3::wm_icon = "localedrake"; $::Wizard_title = N("LocaleDrake"); any::selectLanguage_and_more_standalone($in, $locale); -if ($> && lang::IM2packages($locale)) { +if ($>) { + my @required_packages = lang::IM2packages($locale); + my @missing_packages = difference2(\@required_packages, [ $in->do_pkgs->are_installed(@required_packages) ]); $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) + @missing_packages, ), ) - ); + ) if @missing_packages; } 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()) { - $in->ask_yesorno('', $msg, 1) - and any::ask_window_manager_to_logout($wm); -} else { - $in->ask_warn('', $msg); -} +any::ask_for_X_restart($in); |