language/country selection change:

- first install step is selection of your language, in your language;
  it uses images for that
- language->country is probed, the selection of the country is possible
  if there was a problem, in the Summary step
- in the $o big structure, we now use $o->{locale} which contains
  three keys: lang, country and utf8
- lang.pm has been cleaned and rewritten a bit
- keyboard probing now done only on language (because this step is
  at the beginning of the install)
- timezone probing done on country, if use changes country before
  timezone in the Summary, re-probe timezone accordingly

1 files changed, 2 insertions, 7 deletions

diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm
index 61812af12..cad0c0348 100644
--- a/perl-install/install_gtk.pm
+++ b/perl-install/install_gtk.pm
@@ -46,27 +46,22 @@ sub install_theme {
     load_rc($_) foreach "themes-$o->{theme}", "install", "themes";
 
     my %pango_font_name;
-    if (my $pango_font = lang::lang2pango_font($o->{lang})) {
+    if (my $pango_font = lang::l2pango_font($o->{locale}{lang})) {
 	$pango_font_name{10} = "font_name = \"$pango_font 10\"";
 	$pango_font_name{12} = "font_name = \"$pango_font 12\"";
     }
-    if (my ($font, $font2) = lang::get_x_fontset($o->{lang}, $::rootwidth < 800 ? 10 : 12)) {
-	$font2 ||= $font;
-	Gtk2::Rc->parse_string(qq(
+    Gtk2::Rc->parse_string(qq(
 style "default-font" 
 {
-   fontset = "$font,*"
    $pango_font_name{12}
 }
 style "small-font"
 {
-   fontset = "$font2,*"
    $pango_font_name{10}
 }
 widget "*" style "default-font"
 
 ));
-    }
     gtkset_background(@background1) unless $::live; #- || testing;
 
     create_logo_window($o);