From eef3120c268ba7e603e069e483ad41987ed1fd2f Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 3 Jun 2005 00:14:25 +0000 Subject: use any::selectLanguage_and_more_standalone() --- perl-install/standalone/localedrake | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'perl-install/standalone') diff --git a/perl-install/standalone/localedrake b/perl-install/standalone/localedrake index 5517ad5d1..3c379c763 100644 --- a/perl-install/standalone/localedrake +++ b/perl-install/standalone/localedrake @@ -37,31 +37,7 @@ my $in = 'interactive'->vnew; $ugtk2::wm_icon = "localedrake"; $::Wizard_title = N("LocaleDrake"); -sub select_country() { - any::selectCountry($in, $locale); -} - -eval { - local $::isWizard = 1; - language: - local $::Wizard_no_previous = 1; - my $old_lang = $locale->{lang}; - $in->{locale} = $locale; - $locale->{lang} = any::selectLanguage($in, $locale->{lang}); - $locale->{IM} = lang::get_default_im($locale->{lang}) if $old_lang ne $locale->{lang}; - undef $::Wizard_no_previous; - select_country() or goto language; -}; -if ($@) { - if ($@ =~ /^one lang only/) { - select_country() or $in->exit(0); - } elsif ($@ !~ /wizcancel/) { - die; - } else { - $in->exit(0); - } -} - +any::selectLanguage_and_more_standalone($in, $locale); lang::write($locale, $>); my $msg = N("The change is done, but to be effective you must logout"); -- cgit v1.2.1