Since the coding adding a language-related layout may return from the
apply method, move timezone preseting before it.
---
pyanaconda/ui/gui/spokes/welcome.py | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py
index e4dd145..b80ccb9 100644
--- a/pyanaconda/ui/gui/spokes/welcome.py
+++ b/pyanaconda/ui/gui/spokes/welcome.py
@@ -56,6 +56,12 @@ class WelcomeLanguageSpoke(StandaloneSpoke):
self.language.select_translation(lang)
self.data.lang.lang = lang

+ #TODO: better use GeoIP data once it is available
+ if self.language.territory and not self.data.timezone.timezone:
+ lang_timezone = localization.get_preferred_timezone(self.language. territory)
+ if lang_timezone:
+ self.data.timezone.timezone = lang_timezone
+
if self.data.keyboard.layouts_list:
#do not add layouts if there are any specified in the kickstart
return
@@ -76,12 +82,6 @@ class WelcomeLanguageSpoke(StandaloneSpoke):
self.data.keyboard.layouts_list.append(layout)
self._xklwrapper.add_layout(layout)

- #TODO: better use GeoIP data once it is available
- if self.language.territory and not self.data.timezone.timezone:
- lang_timezone = localization.get_preferred_timezone(self.language. territory)
- if lang_timezone:
- self.data.timezone.timezone = lang_timezone
-
@property
def completed(self):
return self.data.lang.lang and self.data.lang.lang != ""
--
1.7.4.4

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list