changed handling of language selection

corrected the most infamous english spelling errors in install2.pm

3 files changed, 148 insertions, 62 deletions

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 749d9ac5b..fed37c341 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -64,17 +64,17 @@ before use them."),
 
 formatPartitions => 
  __("The partitions lately created must be formatted so that the system can use them.
-You can also format partitions before created and used if you wish to remove all the data which
-contain. Note that it is not necessary to format the partitions created before used if they contain data to
-which you want to keep (typical cases: / home and / usr/local)."),
+You can also format partitions previously created and used if you wish to remove all the data they
+contain. Note that it is not necessary to format the partitions already created and in use
+if they contain data you want to keep (typical cases: /home and /usr/local)."),
 choosePackages => 
- __("You now have the possibility of choosing the software which you wish to install.
+ __("You now have the possibility of choosing the software that you wish to install.
 
 Please note that packages manage the dependences: that means that if you wish to install
-a software requiring the presence of another software, this last will be automatically selected
-and that it will be impossible for you to install the first without installing the second.
+a software requiring the presence of another software, the latter will be automatically selected
+and that it will be impossible for you to install the former without installing the latter.
 
-Information on each category of packages and each one of enter of them are available in zone \"Infos\"
+Information on each category of packages and each one of them is available in the zone \"Infos\"
 located above buttons of confirmation/selection/deselection."),
 doInstallStep => 
  __("Selected packages are now getting installed on your system. This operation take only a few minutes."),
@@ -88,7 +88,7 @@ The password should not be too simple so that whoever cannot be connected under
 It should not be either too sophisticated under penalty of being difficult to retain and, finally, forgotten.
 
 When you wish to connect yourselves on your Linux system as an administrator, the \"login\" 
-is \"root\" and the \"passswrd\", this one which you now will indicate."),
+is \"root\" and the \"password\", this one which you now will indicate."),
 addUser => 
  __("You can now authorize one or more people to be connected on your Linux system. Each one of
 them will profit from his own environment will be able to configure.
@@ -99,8 +99,8 @@ is a very bad idea. This last having all the rights it is certain that at one ti
 This is highly preferable you connect as simple user and that you use the account \"root\" only when
 that is essential."),
 doInstallStep => 
- __("The system being now copied on your disk, he is now time to indicate to him from where he will have to start.
-With less than you know exactly what you do, always choose \"First sector of drive\"."),
+ __("The system being now copied on your disk, he is now time to indicate to it from where it will have to start.
+Unless you know exactly what you do, always choose \"First sector of drive\"."),
 
 configureX => 
  __("It is now time to configure the graphic server. First of all, choose your monitor. You have then
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 9a30749a7..7888b120f 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -8,22 +8,86 @@ use commands;
 use cpio;
 use log;
 
+# key (to be used in $LC_ALL), [0] = english name, [1] = charset encoding,
+# [2] = value for $LANG, [3] = value for LANGUAGE (a list of possible
+# languages, carefully choosen)
 my @fields =
 my %languages = (
-  "en" => [ "English",   undef,		undef,		"en_US" ],
-  "fr" => [ "French",    "lat0-sun16",	"iso15",	"fr_FR" ],
-  "de" => [ "German",    "lat0-sun16",	"iso15",	"de_DE" ],
-  "hu" => [ "Hungarian", "lat2-sun16",  "iso02",	"hu_HU" ],
-  "is" => [ "Icelandic", "lat0-sun16",	"iso15",	"is_IS" ],
-  "id" => [ "Indonesian","lat0-sun16",  "iso15",        "id" ],
-  "it" => [ "Italian",   "lat0-sun16",	"iso15",	"it_IT" ],
-  "no" => [ "Norwegian", "lat0-sun16",	"iso15",	"no_NO" ],
-  "ro" => [ "Romanian",  "lat2-sun16",	"iso02",	"ro_RO" ],
-  "sk" => [ "Slovak",    "lat2-sun16",	"iso02",	"sk_SK" ],
-  "es" => [ "Spanish",   "lat0-sun16",  "iso15",        "es" ],
-  "ru" => [ "Russian",   "Cyr_a8x16", 	"koi2alt",	"ru_SU" ],
-  "uk" => [ "Ukrainian", "ruscii_8x16",	"koi2alt",	"uk_UA" ],
-  "wa" => [ "Walon",     "lat0-sun16",  "iso15",        "wa" ],
+  "en"  => [ "English",			undef,	      "en", "en_US" ],
+"fr_FR" => [ "French (France)",		"iso-8859-1", "fr", "fr_FR" ],
+"de_DE" => [ "German (Germany)",	"iso-8859-1", "de", "de_DE" ],
+  "hu"  => [ "Hungarian", 		"iso-8859-2", "hu", "hu" ],
+  "is"  => [ "Icelandic", 		"iso-8859-1", "is", "is" ],
+  "id"  => [ "Indonesian",		"iso-8859-1", "id", "id" ],
+  "it"  => [ "Italian",   		"iso-8859-1", "it", "it_IT" ],
+  "ja"  => [ "Japanese",		"jisx0208",   "ja", "ja_JP.ujis" ],
+  "no"  => [ "Norwegian (Bokmaal)",	"iso-8859-1", "no", "no:no\@nynorsk" ],
+"no\@nynorsk" => [ "Norwegian (Nynorsk)","iso-8859-1","no", "no\@nynorsk" ],
+"pt_BR" => [ "Portuguese (Brazil)",	"iso-8859-1", "pt", "pt_BR:pt_PT" ],
+"pt_PT" => [ "Portuguese (Portugal)",	"iso-8859-1", "pt", "pt_PT:pt_BR" ],
+  "ro"  => [ "Romanian",  		"iso-8859-2", "ro", "ro" ],
+  "ru"  => [ "Russian",   		"koi8-r",     "ru", "ru" ],
+  "sk"  => [ "Slovak",    		"iso-8859-2", "sk", "sk" ],
+"es_ES" => [ "Spanish (Spain)",		"iso-8859-1", "es", "es" ],
+  "tr"  => [ "Turkish",	 		"iso-8859-9", "tr", "tr" ],
+  "uk"  => [ "Ukrainian", 		"koi8-u",     "uk", "uk" ],
+  "wa"  => [ "Walon",     		"iso-8859-1", "wa", "wa:fr_BE" ],
+);
+
+my %charsets = (
+  "armscii-8"  => [ "arm8.fnt",			"armscii8",
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
+	"*-*helv*-medium-r-normal--14-*-*-*-*-armscii-8" ],
+  "iso-8859-1" => [ "lat0-sun16.psf",		"iso15", 
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1" ],
+  "iso-8859-2" => [ "lat2-sun16.psf",		"iso02",
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-2" ],
+  "iso-8859-3" => [ "iso03.f16",		"iso03",
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-3" ],
+  "iso-8859-4" => [ "lat4u-16.psf",		"iso04",
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-4" ],
+  "iso-8859-5" => [ "iso05.f16",		"iso05",
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-5" ],
+# arabic needs special console driver for text mode [acon]
+# (and gtk support isn't done yet)
+  "iso-8859-6" => [ "iso06.f16",		"iso06",
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-6" ],
+  "iso-8859-7" => [ "iso07.f16",		"iso07",
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-7" ],
+# hebrew needs special console driver for text mode (none yet)
+# (and gtk support isn't done yet)
+  "iso-8859-8" => [ "iso08.f16",		"iso08",
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-8" ],
+  "iso-8859-9" => [ "lat5-16.psf",		"iso09",
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-9" ],
+  "iso-8859-15" => [ "lat0-sun16.psf",		"iso15",
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-15" ],
+# japanese needs special console driver for text mode [kon2]
+  "jisx0208"   => [ "????",			"????",
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
+	"-*-*-medium-r-normal--14-*-*-*-*-*-jisx0208.1983-0," .
+	"-*-*-medium-r-normal--14-*-*-*-*-*-jisx0201.1976-0" ],
+  "koi8-r"     => [ "Cyr_a8x16.psf",		"koi2alt",
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
+	"*-helvetica-medium-r-normal--14-*-*-*-*-koi8-r" ],
+  "koi8-u"     => [ "ruscii_8x16.psf",		"koi2alt",
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
+	"*-helvetica-medium-r-normal--14-*-*-*-*-koi8-u" ],
+  "tcvn"       => [ "tcvn8x16.psf",		"tcvn",
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
+	"*-helvetica-medium-r-normal--14-*-*-*-*-tcvn-5712" ],
+  "viscii"     => [ "viscii10-8x16.psf",	"viscii",
+	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
+	"*-helvetica-medium-r-normal--14-*-*-*-*-viscii1.1-1" ],
 );
 
 1;
@@ -42,9 +106,10 @@ sub set {
     my $lang = shift;
 
     if ($lang) {
-	$ENV{LANG} = $ENV{LINGUAS} = $lang;
-	$ENV{LC_ALL} = $languages{$lang}[3];
-	#if (my $f = $languages{$lang}[1]) { load_font($f) }
+	$ENV{LC_ALL} = $lang;
+	$ENV{LANG} = $languages{$lang}[2];
+	$ENV{LANGUAGES} = $languages{$lang}[3];
+	if (my $f = $languages{$lang}[1]) { load_font($f) }
     } else {
 	# stick with the default (English) */
 	delete $ENV{LANG};
@@ -55,32 +120,49 @@ sub set {
 
 sub write {
     my ($prefix) = @_;
-    my $lang = $ENV{LANG};
+    my $lang = $ENV{LC_ALL};
 
     $lang or return;
     local *F;
     open F, "> $prefix/etc/sysconfig/i18n" or die "failed to reset $prefix/etc/sysconfig/i18n for writing";
     my $f = sub { $_[1] and print F "$_[0]=$_[1]\n"; };
 
-    &$f("LANG", $lang);
-    &$f("LINGUAS", $lang);
+    &$f("LC_ALL", $lang);
     if (my $l = $languages{$lang}) {
-	&$f("LC_ALL", $l->[3]);
+	&$f("LANG", $l->[2]);
+	&$f("LANGUAGE", $l->[3]);
+
 	$l->[1] or return;
-	&$f("SYSFONT", $l->[1]);
-	&$f("SYSFONTACM", $l->[2]);
+	if (my $c = $charsets{$l->[1]}) {
+	    &$f("SYSFONT", $c->[0]);
+	    &$f("SYSFONTACM", $c->[1]);
 
-	my $p = "$prefix/usr/lib/kbd";
-	commands::cp("-f", 
-		     "$p/consolefonts/$l->[1].psf.gz", 
-		     glob_("$p/consoletrans/$l->[2]*"), 
+	    my $p = "$prefix/usr/lib/kbd";
+	    commands::cp("-f", 
+		     "$p/consolefonts/$c->[0].gz", 
+		     glob_("$p/consoletrans/$c->[1]*"), 
 		     "$prefix/etc/sysconfig/console");
+	}
     }
 }
 
 sub load_font {
-    my ($fontFile) = @_;
-    log::l("loading font /usr/share/consolefonts/$fontFile.psf");
-    c::loadFont("/tmp/$fontFile") or log::l("error in loadFont: one of PIO_FONT PIO_UNIMAPCLR PIO_UNIMAP PIO_UNISCRNMAP failed: $!");
-    print STDERR "\033(K";
+    my ($charset) = @_;
+    my $fontFile = "lat0-sun16";
+    my $fontSet = "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1";
+
+    if (my $c = $charsets{$charset}) {
+	log::l("loading " . $c . " font");
+        $fontFile = $c->[0];
+	$fontSet = $c->[2];
+    }
+
+    # text mode font  
+    log::l("loading font /usr/share/consolefonts/$fontFile");
+    #c::loadFont("/tmp/$fontFile") or log::l("error in loadFont: one of PIO_FONT PIO_UNIMAPCLR PIO_UNIMAP PIO_UNISCRNMAP failed: $!");
+    #print STDERR "\033(K";
+
+    # X11 font
+    log::l("fontset: " . $fontSet);
+    Gtk::Gdk::Font::fontset_load("*",$fontSet);
 }
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 1264b6506..cec1d255f 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: panoramix VERSION\n"
-"POT-Creation-Date: 1999-08-27 14:32+0200\n"
+"POT-Creation-Date: 1999-08-28 15:29+0200\n"
 "PO-Revision-Date: 1999-08-25 11:07+0200\n"
 "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
 "Language-Team: norwegian\n"
@@ -419,7 +419,7 @@ msgstr "Formater"
 msgid "Move"
 msgstr "Flytt"
 
-#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:433
+#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:434
 msgid "Resize"
 msgstr "Endre størrelse"
 
@@ -517,7 +517,7 @@ msgstr "alle data på denne partisjonen vil gå tapt"
 msgid "Error"
 msgstr "Feil"
 
-#: ../diskdrake.pm_.c:157 ../diskdrake.pm_.c:501
+#: ../diskdrake.pm_.c:157 ../diskdrake.pm_.c:502
 msgid "Mount point: "
 msgstr "Monteringspunkt: "
 
@@ -670,51 +670,57 @@ msgstr "Flytter partisjon..."
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "Partisjonstabellen på disk %s blir nå skrevet til disk!"
 
-#: ../diskdrake.pm_.c:424
+#: ../diskdrake.pm_.c:406
+msgid "You'll need to reboot before the modification can take place"
+msgstr ""
+"Du må starte maskinen på nytt for at modifiseringene "
+"skal tre i kraft"
+
+#: ../diskdrake.pm_.c:425
 msgid "Computing fat filesystem bounds"
 msgstr "Beregner fat filsystemgrense"
 
-#: ../diskdrake.pm_.c:424 ../diskdrake.pm_.c:460 ../interactive_gtk.pm_.c:79
+#: ../diskdrake.pm_.c:425 ../diskdrake.pm_.c:461 ../interactive_gtk.pm_.c:79
 msgid "Resizing"
 msgstr "Endrer størrelse"
 
-#: ../diskdrake.pm_.c:430
+#: ../diskdrake.pm_.c:431
 msgid "resizing"
 msgstr "Endrer størrelse"
 
-#: ../diskdrake.pm_.c:440
+#: ../diskdrake.pm_.c:441
 msgid "Choose the new size"
 msgstr "Velg ny størrelse"
 
-#: ../diskdrake.pm_.c:440
+#: ../diskdrake.pm_.c:441
 msgid "MB"
 msgstr "MB"
 
-#: ../diskdrake.pm_.c:478
+#: ../diskdrake.pm_.c:479
 msgid "Create a new partition"
 msgstr "Opprette en ny partisjon"
 
-#: ../diskdrake.pm_.c:494
+#: ../diskdrake.pm_.c:495
 msgid "Start sector: "
 msgstr "Start sektor: "
 
-#: ../diskdrake.pm_.c:497
+#: ../diskdrake.pm_.c:498
 msgid "Size in MB: "
 msgstr "Størrelse i MB: "
 
-#: ../diskdrake.pm_.c:500
+#: ../diskdrake.pm_.c:501
 msgid "Filesystem type: "
 msgstr "Filsystemtype: "
 
-#: ../diskdrake.pm_.c:502
+#: ../diskdrake.pm_.c:503
 msgid "Preference: "
 msgstr "Valg: "
 
-#: ../diskdrake.pm_.c:544 ../diskdrake.pm_.c:560
+#: ../diskdrake.pm_.c:545 ../diskdrake.pm_.c:561
 msgid "Select file"
 msgstr "Velg fil"
 
-#: ../diskdrake.pm_.c:561
+#: ../diskdrake.pm_.c:562
 msgid "Warning"
 msgstr "Advarsel"
 
@@ -909,7 +915,6 @@ msgstr ""
 "noen få minutter."
 
 #: ../install2.pm_.c:82
-#, fuzzy
 msgid ""
 "The system now requires an administrator password for your Linux system.\n"
 "This passwd is required of you by twice in order to being certain of its "
@@ -976,9 +981,8 @@ msgstr ""
 #: ../install2.pm_.c:102
 msgid ""
 "The system being now copied on your disk, he is now time to indicate to it "
-"from where he will have to start.\n"
-"Unless than you know exactly what you do, always choose \"First sector of "
-"drive\"."
+"from where it will have to start.\n"
+"Unless you know exactly what you do, always choose \"First sector of drive\"."
 msgstr ""
 "Systemet blir nå kopiert til disken din, det er nå på tide å indikere hvor "
 "starten skal være.\n"
@@ -1083,7 +1087,7 @@ msgstr "ekspert"
 msgid "server"
 msgstr "tjener"
 
-#: ../install2.pm_.c:230
+#: ../install2.pm_.c:227
 msgid ""
 "An error has occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
@@ -1091,7 +1095,7 @@ msgstr ""
 "En feil har oppstått - ingen gyldige enheter ble funnet for å opprette nye "
 "filsystemer. Vennligst sjekk maskinvaren din for årsaken til dette problemet"
 
-#: ../install2.pm_.c:251
+#: ../install2.pm_.c:242
 msgid "partitionning failed: no root filesystem"
 msgstr "partisjonering feilet: intet root filsystem"