diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-03-01 14:26:19 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-03-01 14:26:19 +0000 |
| commit | eb6c6075e68e72f92d37b54bbdf7c1dc3ee40e12 (patch) | |
| tree | 9994c1f852d98f3cb85193c6c4abc3ea0d175c0c | |
| parent | 47c613353ca1594a85ddf89924409ef5e609061a (diff) | |
| download | drakx-eb6c6075e68e72f92d37b54bbdf7c1dc3ee40e12.tar drakx-eb6c6075e68e72f92d37b54bbdf7c1dc3ee40e12.tar.gz drakx-eb6c6075e68e72f92d37b54bbdf7c1dc3ee40e12.tar.bz2 drakx-eb6c6075e68e72f92d37b54bbdf7c1dc3ee40e12.tar.xz drakx-eb6c6075e68e72f92d37b54bbdf7c1dc3ee40e12.zip | |
add 'C' in %charset2kde_font (so that english has normal fonts)
| -rw-r--r-- | perl-install/lang.pm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/lang.pm b/perl-install/lang.pm index d0437b41b..bd8eb89ba 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -548,13 +548,13 @@ sub charset2kde_charset { #- font+size for different charsets; the field [0] is the default, #- others are overrridens for fixed(1), toolbar(2), menu(3) and taskbar(4) my %charset2kde_font = ( + 'C' => [ "adobe-helvetica,12", "courier,10", "adobe-helvetica,11" ], 'iso-8859-1' => [ "adobe-helvetica,12", "courier,10", "adobe-helvetica,11" ], 'iso-8859-2' => [ "adobe-helvetica,12", "courier,10", "adobe-helvetica,11" ], 'iso-8859-9' => [ "adobe-helvetica,12", "courier,10", "adobe-helvetica,11" ], 'iso-8859-15' => [ "adobe-helvetica,12", "courier,10", "adobe-helvetica,11" ], 'utf_1' => [ "adobe-helvetica,12", "courier,10", "adobe-helvetica,11" ], 'utf_2' => [ "adobe-helvetica,12", "courier,10", "adobe-helvetica,11" ], - 'utf_9' => [ "adobe-helvetica,12", "courier,10", "adobe-helvetica,11" ], 'utf_15' => [ "adobe-helvetica,12", "courier,10", "adobe-helvetica,11" ], 'gb2312' => [ "default-ming,16" ], 'jisx0208' => [ "misc-fixed,14", "wadalab-gothic,13" ], @@ -890,6 +890,10 @@ sub check { # consolefonts are checked during build via console_font_files() + if (my @l = difference2([ 'default', keys %charsets ], [ keys %charset2kde_font ])) { + $warn->("no kde font for charset " . join(" ", @l)); + } + if (my @l = grep { lang2country($_) eq 'C' } list()) { $warn->("no country for langs " . join(" ", @l)); } |