diff options
| author | Olivier Blin <oblin@mandriva.com> | 2009-10-13 17:59:12 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2009-10-13 17:59:12 +0000 |
| commit | 16ac82e2724236a778c0eae6275e84008f9e2083 (patch) | |
| tree | d6b0a5961695247eff684db81cae32f60c1402e5 | |
| parent | 5cac2226c04a1cd65d20e6eccad6c9c633190352 (diff) | |
| download | drakx-16ac82e2724236a778c0eae6275e84008f9e2083.tar drakx-16ac82e2724236a778c0eae6275e84008f9e2083.tar.gz drakx-16ac82e2724236a778c0eae6275e84008f9e2083.tar.bz2 drakx-16ac82e2724236a778c0eae6275e84008f9e2083.tar.xz drakx-16ac82e2724236a778c0eae6275e84008f9e2083.zip | |
remove utf8_forced magic since we do not have to remember anymore if
the selected lang prefers UTF-8 or not, we use UTF-8 by default for
all langs now
| -rw-r--r-- | perl-install/any.pm | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index aa601199a..14b0d4009 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -1098,7 +1098,6 @@ sub selectLanguage_install { } my $non_utf8 = 0; - my $utf8_forced; add2hash($common, { cancel => '', focus_first => 1, advanced_messages => formatAlaTeX(N("Mandriva Linux can support multiple languages. Select @@ -1111,12 +1110,9 @@ when your installation is complete and you restart your system.")), { val => \$lang, separator => '|', if_($using_images, image2f => sub { $name2l{$_[0]} =~ /^[a-z]/ && "langs/lang-$name2l{$_[0]}" }), format => sub { $_[0] =~ /(.*\|)(.*)/ ? $1 . lang::l2name($2) : lang::l2name($_[0]) }, - list => \@langs, sort => !$in->isa('interactive::gtk'), changed => sub { - #- very special cases for langs which do not like UTF-8 - $non_utf8 = 0 if !$utf8_forced; - }, focus_out => sub { $langs->{$listval2val->($lang)} = 1 } }, - { val => \$non_utf8, type => 'bool', text => N("Old compatibility (non UTF-8) encoding"), - advanced => 1, changed => sub { $utf8_forced = 1 } }, + list => \@langs, sort => !$in->isa('interactive::gtk'), + focus_out => sub { $langs->{$listval2val->($lang)} = 1 } }, + { val => \$non_utf8, type => 'bool', text => N("Old compatibility (non UTF-8) encoding"), advanced => 1 }, { val => \$langs->{all}, type => 'bool', text => N("All languages"), advanced => 1 }, map { { val => \$langs->{$_->[0]}, type => 'bool', disabled => sub { $langs->{all} }, |