diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2003-09-17 11:42:22 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2003-09-17 11:42:22 +0000 |
| commit | 0b7baa75894f2371003585829deb31a43b4b6564 (patch) | |
| tree | ce53797fcba65bc66cf9c00835ec9330c96a1aa8 /perl-install | |
| parent | 21e28d189899b6870fa2f7b5f08be47846db7f90 (diff) | |
| download | drakx-0b7baa75894f2371003585829deb31a43b4b6564.tar drakx-0b7baa75894f2371003585829deb31a43b4b6564.tar.gz drakx-0b7baa75894f2371003585829deb31a43b4b6564.tar.bz2 drakx-0b7baa75894f2371003585829deb31a43b4b6564.tar.xz drakx-0b7baa75894f2371003585829deb31a43b4b6564.zip | |
treat C encoding specially when computing utf8 flag, it should not trigger utf8 set by itself
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install_steps.pm | 2 | ||||
| -rw-r--r-- | perl-install/lang.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 7ac795c2c..25d6d97c9 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -103,7 +103,7 @@ sub selectLanguage { } lang::langs_selected($o->{locale}); - log::l("selectLanguage: pack_langs ", lang::pack_langs($o->{locale}{langs})); + log::l("selectLanguage: pack_langs: ", lang::pack_langs($o->{locale}{langs}), " utf8-flag: ", to_bool($o->{locale}{utf8})); #- for auto_install compatibility with old $o->{keyboard} containing directly $o->{keyboard}{KEYBOARD} $o->{keyboard} = { KEYBOARD => $o->{keyboard} } if $o->{keyboard} && !ref($o->{keyboard}); diff --git a/perl-install/lang.pm b/perl-install/lang.pm index defa956bb..8d7d3a30c 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -835,7 +835,7 @@ sub langs_selected { my ($locale) = @_; #- adding the UTF-8 flag (if not forced) depends on the selected languages $locale->{utf8} ||= l2charset($locale->{lang}) =~ /utf|unicode/ - || (uniq map { l2charset($_) } langs($locale->{langs})) > 1; + || (uniq(grep { $_ ne 'C' } map { l2charset($_) } langs($locale->{langs}))) > 1; } sub pack_langs { |