Set the default timezone based on the current language, whether we can display

it or not (#227625).

3 files changed, 7 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 9c7009a27..21f50ff33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 2007-02-20  Chris Lumens  <clumens@redhat.com>
 
 	* anaconda: Add dpi flag when starting X (#224665).
+	Set the default timezone based on the current language even if we
+	can't display it yet (#227625).
+
+	* instdata.py (InstallData.reset):  Set the default timezone based on
+	current language.
 
 	* scripts/upd-instroot:  Several important terminfo files have moved
 	into /lib (#228596, #229236).
diff --git a/anaconda b/anaconda
index 0e2693fb2..8e1284831 100755
--- a/anaconda
+++ b/anaconda
@@ -908,6 +908,7 @@ if __name__ == "__main__":
         anaconda.dispatch.skipStep("language", permanent = 1)
         instClass.setLanguage(anaconda.id, opts.lang)
         instClass.setLanguageDefault(anaconda.id, opts.lang)
+        anaconda.id.timezone.setTimezoneInfo(anaconda.id.instLanguage.getDefaultTimeZone())
 
     if opts.keymap:
         anaconda.dispatch.skipStep("keyboard", permanent = 1)
diff --git a/instdata.py b/instdata.py
index d63e18033..91ca81ad5 100644
--- a/instdata.py
+++ b/instdata.py
@@ -58,6 +58,7 @@ class InstallData:
 	self.firewall = firewall.Firewall()
         self.security = security.Security()
 	self.timezone = timezone.Timezone()
+        self.timezone.setTimezoneInfo(self.instLanguage.getDefaultTimeZone())
         self.users = None
         self.rootPassword = { "isCrypted": False, "password": "" }
 	self.auth = "--enableshadow --enablemd5"