summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-03-16 17:09:31 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-03-16 17:09:31 +0000
commit21291891a7c1bbd0125415987fbfb3d6cfbe6f77 (patch)
tree64560177df17e672e2bad0ef1832498b84f225c4
parent3fe9883aab4ab72f2c898756444ad3ee0f56834b (diff)
downloaddrakx-21291891a7c1bbd0125415987fbfb3d6cfbe6f77.tar
drakx-21291891a7c1bbd0125415987fbfb3d6cfbe6f77.tar.gz
drakx-21291891a7c1bbd0125415987fbfb3d6cfbe6f77.tar.bz2
drakx-21291891a7c1bbd0125415987fbfb3d6cfbe6f77.tar.xz
drakx-21291891a7c1bbd0125415987fbfb3d6cfbe6f77.zip
enable to enable/disable utf-8
-rw-r--r--perl-install/any.pm5
-rw-r--r--perl-install/standalone/localedrake1
2 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index f39ab8f65..f9358761f 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -760,11 +760,14 @@ when your installation is complete and you restart your system.")),
$listval2val->($lang);
} else {
+ my $utf = $in->{locale}{utf8};
my @langs = sort { lang::l2name($a) cmp lang::l2name($b) } lang::list_langs(exclude_non_installed => 1);
die 'one lang only' if @langs == 1;
$in->ask_from_($common,
[ { val => \$lang, type => 'list',
- format => sub { lang::l2name($_[0]) }, list => \@langs } ]) or return;
+ format => sub { lang::l2name($_[0]) }, list => \@langs },
+ { val => \$in->{locale}{utf8}, type => 'bool', text => N("Use Unicode by default") }, #, advanced => 1
+ ]) or return;
$lang;
}
}
diff --git a/perl-install/standalone/localedrake b/perl-install/standalone/localedrake
index 17ecfc0cf..a329cc05b 100644
--- a/perl-install/standalone/localedrake
+++ b/perl-install/standalone/localedrake
@@ -46,6 +46,7 @@ eval {
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;