for finish-install

2 files changed, 29 insertions, 0 deletions

diff --git a/perl-install/any.pm b/perl-install/any.pm
index a4cf3d577..75e430e80 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -774,6 +774,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) = @_;
 
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 3922c47ca..634ef7a99 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -899,6 +899,10 @@ sub set {
 	move::handleI18NClp($locale->{lang});
 	put_in_hash(\%ENV, i18n_env($locale));
 	return;
+    } elsif (!$::isInstall) {
+	put_in_hash(\%ENV, i18n_env($locale));
+	bindtextdomain();
+	return;
     }
 
     my $lang = $locale->{lang};