diff options
| author | Pablo Saratxaga <pablo@mandriva.com> | 2004-03-12 14:41:35 +0000 |
|---|---|---|
| committer | Pablo Saratxaga <pablo@mandriva.com> | 2004-03-12 14:41:35 +0000 |
| commit | a673fba662091527c08518a326146c41aab56b76 (patch) | |
| tree | a6c2761f22117035ab46a7fc913795fa62e30470 | |
| parent | 659dd117216676ebcab4ea6115b892bf3e5aab09 (diff) | |
| download | drakx-a673fba662091527c08518a326146c41aab56b76.tar drakx-a673fba662091527c08518a326146c41aab56b76.tar.gz drakx-a673fba662091527c08518a326146c41aab56b76.tar.bz2 drakx-a673fba662091527c08518a326146c41aab56b76.tar.xz drakx-a673fba662091527c08518a326146c41aab56b76.zip | |
always define KDM fonts dependending on encoding (fix for bug #8714)
| -rw-r--r-- | perl-install/lang.pm | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/perl-install/lang.pm b/perl-install/lang.pm index 45dbf5e78..320747067 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -973,7 +973,7 @@ sub write { update_gnomekderc("$ENV{HOME}/.qt/qtrc", General => (XIMInputStyle => $qt_xim)); } - if (!$b_user_only && $locale->{lang} !~ /^(zh_TW|th|vi|be|bg)/) { #- skip since we don't have the right font (it badly fails at least for zh_TW) + if (!$b_user_only) { my $kde_charset = charset2kde_charset(l2charset($locale->{lang})); my $welcome = c::to_utf8(N("Welcome to %s", '%n')); substInFile { @@ -981,9 +981,13 @@ sub write { s/^(Language)=.*/$1=$locale->{lang}/; if (!member($kde_charset, 'iso8859-1', 'iso8859-15')) { #- don't keep the default for those - s/^(StdFont)=.*/$1=*,12,5,$kde_charset,50,0/; - s/^(FailFont)=.*/$1=*,12,5,$kde_charset,75,0/; - s/^(GreetFont)=.*/$1=*,24,5,$kde_charset,50,0/; + my $font_list = $charset2kde_font{$charset} || $charset2kde_font{default}; + my $font_small = $font_list->[0]; + my $font_huge = $font_small; + $font_huge =~ s/(.*),../$1,24/; + s/^(StdFont)=.*/$1=$font_small,5,$kde_charset,50,0/; + s/^(FailFont)=.*/$1=$font_small,5,$kde_charset,75,0/; + s/^(GreetFont)=.*/$1=$font_huge,5,$kde_charset,50,0/; } } "$::prefix/usr/share/config/kdm/kdmrc"; } |