From f83545cabfa4cc23b333bce333be938d91ab2309 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 1 Jun 2005 03:44:24 +0000 Subject: add language selection to finish-install --- perl-install/any.pm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'perl-install/any.pm') diff --git a/perl-install/any.pm b/perl-install/any.pm index 085b3abe7..03b1171be 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -776,6 +776,31 @@ when your installation is complete and you restart your system.")), } } +sub selectLanguage_and_more_standalone { + my ($in, $locale) = @_; + eval { + local $::isWizard = 1; + language: + # keep around previous settings so that selectLanguage can keep UTF-8 flag: + local $::Wizard_no_previous = 1; + my $old_lang = $locale->{lang}; + $in->{locale} = $locale; + $locale->{lang} = selectLanguage($in, $locale->{lang}); + $locale->{IM} = lang::get_default_im($locale->{lang}) if $old_lang ne $locale->{lang}; + undef $::Wizard_no_previous; + selectCountry($in, $locale) or goto language; + }; + if ($@) { + if ($@ =~ /^one lang only/) { + selectCountry($in, $locale) or $in->exit(0); + } elsif ($@ !~ /wizcancel/) { + die; + } else { + $in->exit(0); + } + } +} + sub selectCountry { my ($in, $locale) = @_; -- cgit v1.2.1