Commits

Rodrigo Bistolfi committed c06f122

usersetup: fix timezone setting

Comments (0)

Files changed (1)

vinstall/controller/usersetup.py

     """Setup your user and passwords
 
     """
+    def init(self):
+        self.timezones = timezone.timezones()
+        self.hw_clock_options = ["localtime", "UTC"]
+
     def render(self):
         """Ask for username and passwords
 
 
         tz_options = model.DropdownOptionList()
         tz_options.label = u"Select your timezone"
-        for i in timezone.timezones():
+        for i in self.timezones:
             tz_options.add_option(i)
 
         clock_options = model.DropdownOptionList()
         clock_options.label = u"My hardware clock is set to"
-        clock_options.add_option("localtime")
-        clock_options.add_option("UTC")
+        for i in self.hw_clock_options:
+            clock_options.add_option(i)
 
         return Render(title, intro, username, password, rootpassword,
                 tz_title, tz_options, clock_options)
             yield self.create_user_account, (username, password), "Setting passwords"
         yield self.fstab, tuple(), "Creating fstab"
         yield self.setup_services, tuple(), "Setting up services"
-        yield timezone.set_timezone, (tz,), "Setting timezone"
-        yield timezone.set_hw_clock, (hwclock,), "Setting hardware clock"
+        yield timezone.set_timezone, (self.timezones[tz],), "Setting timezone"
+        yield timezone.set_hw_clock, (self.hw_clock_options[hwclock],), "Setting hardware clock"
 
     def set_root_password(self, rootpassword):
         """Set the root password
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.