diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2004-02-18 17:08:01 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2004-02-18 17:08:01 +0000 |
| commit | 135cb580abfc873836a029b30f42ed9e5f836750 (patch) | |
| tree | 786eb8e3e3a1b6a5e8d58654f8940591c1392c03 /perl-install/lang.pm | |
| parent | cd7d6d3ed11ae86d0c6dcfa8198074fa193653c5 (diff) | |
| download | drakx-135cb580abfc873836a029b30f42ed9e5f836750.tar drakx-135cb580abfc873836a029b30f42ed9e5f836750.tar.gz drakx-135cb580abfc873836a029b30f42ed9e5f836750.tar.bz2 drakx-135cb580abfc873836a029b30f42ed9e5f836750.tar.xz drakx-135cb580abfc873836a029b30f42ed9e5f836750.zip | |
selectlanguage: utf8 flag status is updated when user selects more/less languages; when user touches it, update is disabled, allowing andrej to have an en_GB + ru_RU install without utf8
Diffstat (limited to 'perl-install/lang.pm')
| -rw-r--r-- | perl-install/lang.pm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/lang.pm b/perl-install/lang.pm index 7deb012a2..fd591500c 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -840,11 +840,10 @@ sub langsLANGUAGE { uniq(map { split ':', getLANGUAGE($_, $o_c) } langs($l)); } -sub langs_selected { +sub utf8_should_be_needed { my ($locale) = @_; - #- adding the UTF-8 flag (if not forced) depends on the selected languages - $locale->{utf8} ||= l2charset($locale->{lang}) =~ /utf|unicode/ - || uniq(grep { $_ ne 'C' } map { l2charset($_) } langs($locale->{langs})) > 1; + l2charset($locale->{lang}) =~ /utf|unicode/ + || uniq(grep { $_ ne 'C' } map { l2charset($_) } langs($locale->{langs})) > 1; } sub pack_langs { |