diff options
| author | Matt Wilson <msw@redhat.com> | 2000-08-15 16:24:38 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 2000-08-15 16:24:38 +0000 |
| commit | 662b220be6f5270a524963b0bf66f0e3fdff045e (patch) | |
| tree | 7af89e9e9fcf0c4cf3a66a133f580c0283062781 /iw | |
| parent | 9665cf575536f7c75e5c6167c518d47efdd2814e (diff) | |
| download | anaconda-662b220be6f5270a524963b0bf66f0e3fdff045e.tar.gz anaconda-662b220be6f5270a524963b0bf66f0e3fdff045e.tar.xz anaconda-662b220be6f5270a524963b0bf66f0e3fdff045e.zip | |
don't put None in the XkbVarient, don't set up the keyboard in test mode
Diffstat (limited to 'iw')
| -rw-r--r-- | iw/keyboard_gui.py | 8 | ||||
| -rw-r--r-- | iw/timezone_gui.py | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/iw/keyboard_gui.py b/iw/keyboard_gui.py index a871968e5..b71047530 100644 --- a/iw/keyboard_gui.py +++ b/iw/keyboard_gui.py @@ -44,7 +44,8 @@ class KeyboardWindow (InstallWindow): self.layout = self.layoutList.get_row_data (self.layoutList.selection[0]) self.variant = self.variantList.get_row_data (self.variantList.selection[0]) - self.kb.setRule (self.model, self.layout, self.variant, "complete") + if self.todo.setupFilesystems: + self.kb.setRule (self.model, self.layout, self.variant, "complete") def getScreen (self): if not self.hasrun: @@ -52,7 +53,8 @@ class KeyboardWindow (InstallWindow): if Keyboard.console2x.has_key (default): self.model = Keyboard.console2x[default][0] self.layout = Keyboard.console2x[default][1] - self.kb.setRule (self.model, self.layout, self.variant, "complete") + if self.todo.setupFilesystems: + self.kb.setRule (self.model, self.layout, self.variant, "complete") box = GtkVBox (FALSE, 5) im = self.ics.readPixmap ("gnome-keyboard.png") @@ -114,7 +116,7 @@ class KeyboardWindow (InstallWindow): # as special case, so the text can be less confusing. # self.variantList.append (("None",)) # for (key, variant) in self.rules[2].items (): - for (key, variant) in ((None, (_("Enable dead keys"))), + for (key, variant) in (("", (_("Enable dead keys"))), ("nodeadkeys", (_("Disable dead keys")))): loc = self.variantList.append ((variant,)) self.variantList.set_row_data (loc, key) diff --git a/iw/timezone_gui.py b/iw/timezone_gui.py index f085ae3f7..22783a6d5 100644 --- a/iw/timezone_gui.py +++ b/iw/timezone_gui.py @@ -127,11 +127,12 @@ class TimezoneWindow (InstallWindow): if rc: (self.default, asUTC, asArc) = rc else: - self.default = iutil.defaultZone () + self.default = _(iutil.defaultZone ()) + print self.default asUTC = 0 if (string.find (self.default, "UTC") != -1): - self.default = "America/New_York" + self.default = _("America/New_York") self.id = self.list.connect ("draw", self.setcurrent) |