From fe986507167101d7fb0c31100f52de65e80ec4f4 Mon Sep 17 00:00:00 2001
From: Daouda Lo <daouda@mandriva.com>
Date: Mon, 10 Jun 2002 12:42:26 +0000
Subject: - choose country according to timezone.

---
 perl-install/network/tools.pm | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index 731bd58da..ccc492395 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -5,6 +5,7 @@ use run_program;
 use c;
 use vars qw(@ISA @EXPORT);
 use MDK::Common::Globals "network", qw($in $prefix $disconnect_file $connect_prog $connect_file);
+use MDK::Common::System qw(getVarsFromSh);
 
 @ISA = qw(Exporter);
 @EXPORT = qw(write_cnx_script write_secret_backend write_initscript ask_connect_now connect_backend disconnect_backend read_providers_backend ask_info2 type2interface connected connected_bg connected2 disconnected);
@@ -91,7 +92,7 @@ sub ask_info2 {
 		   if__($cnx->{phone_out}, { label => _("Provider phone number"), val => \$cnx->{phone_out} }),
 		   if__($netc->{dnsServer2}, { label => _("Provider dns 1 (optional)"), val => \$netc->{dnsServer2} }),
 		   if__($netc->{dnsServer3}, { label => _("Provider dns 2 (optional)"), val => \$netc->{dnsServer3} }),
-		   if__($cnx->{vpivci}, { label => _("Choose your country"), val => \$netc->{vpivci}, list => ['Netherlands', 'France', 'Belgium', 'Italy', 'UK', 'USA'] }),
+		   if__($cnx->{vpivci}, { label => _("Choose your country"), val => \$netc->{vpivci}, list => detect_timezone() }),
 		   if__($cnx->{dialing_mode}, { label => _("Dialing mode"), val => \$cnx->{dialing_mode},list=>["auto","manual"]}),
 		   if__($cnx->{speed}, { label => _("Connection speed"), val => \$cnx->{speed}, list => ["64 Kb/s", "128 Kb/s"]}),
 		   if__($cnx->{huptimeout}, { label => _("Connection timeout (in sec)"), val => \$cnx->{huptimeout} }),
@@ -107,6 +108,24 @@ sub ask_info2 {
     1;
 }
 
+sub detect_timezone {
+    my %tmz2country = ( 
+		       'Europe/Paris' => _("France"),
+		       'Europe/Amsterdam' => _("Netherlands"),
+		       'Europe/Rome' => _("Italy"),
+		       'Europe/Brussels' => _("Belgium"), 
+		       'America/New_York' => _("United States"),
+		       'Europe/London' => _("United Kingdom") 
+		      );
+    my %tm_parse = MDK::Common::System::getVarsFromSh('/etc/sysconfig/clock');
+    foreach (keys %tmz2country) {
+	if ($_ eq $tm_parse{ZONE}) {
+	    unshift @country, $tmz2country{$_};
+	} else { push @country, $tmz2country{$_} };
+    }
+    \@country;
+}
+
 sub type2interface {
     my ($i) = @_;
     $i=~/$_->[0]/ and return $_->[1] foreach (
-- 
cgit v1.2.1