summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2002-12-06 15:23:25 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2002-12-06 15:23:25 +0000
commit31ddca4ffe90c41464aa33e70bf8638c12dff062 (patch)
tree2471b434871c2f1b52fa547fcaa39e0cb4e1e90e
parentb8c50cf70eb80b5bcaedcaf6117549ff83bc36cd (diff)
downloaddrakx-31ddca4ffe90c41464aa33e70bf8638c12dff062.tar
drakx-31ddca4ffe90c41464aa33e70bf8638c12dff062.tar.gz
drakx-31ddca4ffe90c41464aa33e70bf8638c12dff062.tar.bz2
drakx-31ddca4ffe90c41464aa33e70bf8638c12dff062.tar.xz
drakx-31ddca4ffe90c41464aa33e70bf8638c12dff062.zip
misc
-rw-r--r--perl-install/lang.pm12
1 files changed, 4 insertions, 8 deletions
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 008e339a4..279f3a738 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -549,18 +549,18 @@ sub charset2kde_font {
# the [0] field tells the font filename,
# if field [1] is empty, that means the X11 fontset mechanism has ot be used.
my %charset2pango_font = (
- 'jisx0208' => [ "k14.pcf" ],
'ksc5601' => [ "baekmuk_gulim_h_14.pcf" ],
'gb2312' => [ "gb16fs.pcf" ],
'Big5' => [ "taipei16.pcf" ],
+ 'jisx0208' => [ "12x13ja.pcf", "Sans" ],
'tis620' => [ "norasi_n.ttf", "Norasi" ],
'tscii' => [ "tscava.ttf", "TSC_Avarangal" ],
'utf_vi' => [ "cu12.pcf", "ClearlyU" ],
'utf_hy' => [ "artsnk_m.ttf", "Artsounk" ],
'utf_ka' => [ "cu12.pcf", "ClearlyU" ],
- 'iso-8859-7' => [ "k.pfb", "Kerkis" ],
- 'iso-8859-8' => [ "cu12.pcf", "ClearlyU" ],
'iso-8859-6' => [ "cu12.pcf", "ClearlyU" ],
+ 'iso-8859-7' => [ "k.pfb", "Kerkis" ],
+ 'iso-8859-8' => [ "KacstBook.pcf", "KacstBook" ],
#- Nimbus Sans L is missing some chars used by some cyrillic languages,
#- but tose haven't yet DrakX translations; it also misses vietnamese
#- latin chars; all other latin and cyrillic are covered.
@@ -570,11 +570,7 @@ my %charset2pango_font = (
sub charset2pango_font {
my ($charset) = @_;
- if (exists $charset2pango_font{$charset}) {
- $charset2pango_font{$charset}->[1];
- } else {
- $charset2pango_font{default}->[1];
- }
+ $charset2pango_font{exists $charset2pango_font{$charset} ? $charset : 'default'}->[1];
}
sub lang2pango_font {