Bug 344476 - Chinese/Japanese/Korean installer's UI looks ugly. r=bsmedberg

toolkit/mozapps/installer/windows/nsis/locales.nsi

@@ -35,8 +35,9 @@
 # ***** END LICENSE BLOCK *****
 
 /**
- * "One off" locale configuration settings for font name, font size, and RTL
- * (e.g. locale text is read right to left).
+ * "One off" locale configuration settings for RTL (e.g. locale text is read
+ * right to left). Fonts should not only be specified if Win9x systems are
+ * supported for East Asian locales.
  */
 
 ; Arabic
@@ -44,20 +45,3 @@
 
 ; Hebrew
 !define he_rtl
-
-; Japanese
-!define ja_font  "ＭＳ Ｐゴシック"
-!define ja_size  "9"
-
-;Korean
-;define ko_font  "굴림"
-;define ko_size  "9"
-
-; Chinese Simplified, China
-!define zh-CN_font  "宋体"
-!define zh-CN_size  "9"
-
-; Chinese Traditional, Taiwan
-!define zh-TW_font  "新細明體"
-!define zh-TW_size  "9"
-

toolkit/mozapps/installer/windows/nsis/preprocess-locale.pl

@@ -59,14 +59,6 @@ open(locales, "<$inFile");
 $lnum = 1;
 while( $line = <locales> ) {
   $line =~ s/[\r\n]*//g;    # remove \r and \n
-  if ($line =~ m|^!define $AB_CD\_font .*|) {
-    $fontName = $line;
-    $fontName =~ s/^!define $AB_CD\_font[^"]*"([^"]*)".*$/$1/g;
-  }
-  if ($line =~ m|^!define $AB_CD\_size .*|) {
-    $fontSize = $line;
-    $fontSize =~ s/^!define $AB_CD\_size[^"]*"([^"]*)".*$/$1/g;
-  }
   if ($line =~ m|^!define $AB_CD\_rtl|) {
     $RTL = "RTL";
   }
@@ -74,7 +66,9 @@ while( $line = <locales> ) {
 }
 close locales;
 
-if ($codepage != "CP1252") {
+# In NSIS codepage CP1252 is specified with a '-'. For all other locales
+# specify the number for the locales codepage.
+if ($langCP ne "CP1252") {
   $nsisCP = $langCP;
   $nsisCP =~ s/^CP(.*)$/$1/g;
 }