summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2007-05-16 17:08:11 +0000
committerChris Lumens <clumens@redhat.com>2007-05-16 17:08:11 +0000
commita892617ba93d0f11c7fc4ca087d494c8669166c9 (patch)
treec1ecf9820caa903906655dbcb8d4f1b2a0799915
parentd5a7e1127c2819ef6920324ef353d908fccd4d66 (diff)
downloadanaconda-a892617ba93d0f11c7fc4ca087d494c8669166c9.tar.gz
anaconda-a892617ba93d0f11c7fc4ca087d494c8669166c9.tar.xz
anaconda-a892617ba93d0f11c7fc4ca087d494c8669166c9.zip
Fix tracebacks caused by yesterday's modifications.
-rw-r--r--ChangeLog2
-rw-r--r--textw/language_text.py18
2 files changed, 11 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 96993bc86..9f4d9eaaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
* loader2/selinux.c (loadpolicy): -b option now causes a warning
message to be printed.
+ * textw/language_text.py: Fix tracebacks from yesterday's changes.
+
2007-05-15 Chris Lumens <clumens@redhat.com>
* anaconda.spec: Bump version.
diff --git a/textw/language_text.py b/textw/language_text.py
index 6740b0be4..48d26cbac 100644
--- a/textw/language_text.py
+++ b/textw/language_text.py
@@ -22,17 +22,17 @@ log = logging.getLogger("anaconda")
class LanguageWindow:
def __call__(self, screen, anaconda):
id = anaconda.id
- languages = instLanguage.available ()
+ languages = id.instLanguage.available ()
languages.sort()
- current = instLanguage.getCurrent()
+ current = id.instLanguage.getCurrent()
height = min((8, len(languages)))
buttons = [TEXT_OK_BUTTON, TEXT_BACK_BUTTON]
translated = []
for lang in languages:
- translated.append ((_(lang), instLanguage.getNickByName(lang)))
+ translated.append ((_(lang), id.instLanguage.getNickByName(lang)))
(button, choice) = \
ListboxChoiceWindow(screen, _("Language Selection"),
_("What language would you like to use during the "
@@ -43,18 +43,18 @@ class LanguageWindow:
if button == TEXT_BACK_CHECK:
return INSTALL_BACK
- if instLanguage.getFontFile(choice) == "none":
+ if id.instLanguage.getFontFile(choice) == "none":
ButtonChoiceWindow(screen, "Language Unavailable",
"%s display is unavailable in text mode. The "
"installation will continue in English." % (choice,),
buttons=[TEXT_OK_BUTTON])
- instLanguage.setRuntimeDefaults(choice)
- timezone.setTimezoneInfo(instLanguage.getDefaultTimeZone())
+ id.instLanguage.setRuntimeDefaults(choice)
+ id.timezone.setTimezoneInfo(id.instLanguage.getDefaultTimeZone())
return INSTALL_OK
- instLanguage.setRuntimeLanguage(choice)
- instLanguage.setDefault(choice)
- timezone.setTimezoneInfo(instLanguage.getDefaultTimeZone())
+ id.instLanguage.setRuntimeLanguage(choice)
+ id.instLanguage.setDefault(choice)
+ id.timezone.setTimezoneInfo(id.instLanguage.getDefaultTimeZone())
anaconda.intf.drawFrame()