diff options
Diffstat (limited to 'textw')
| -rw-r--r-- | textw/keyboard_text.py | 2 | ||||
| -rw-r--r-- | textw/language_text.py | 21 | ||||
| -rw-r--r-- | textw/timezone_text.py | 2 |
3 files changed, 12 insertions, 13 deletions
diff --git a/textw/keyboard_text.py b/textw/keyboard_text.py index d136446df..3dbc2d6e9 100644 --- a/textw/keyboard_text.py +++ b/textw/keyboard_text.py @@ -39,7 +39,7 @@ class KeyboardWindow: if anaconda.id.keyboard.beenset: default = anaconda.id.keyboard.get () else: - default = anaconda.id.instLanguage.getDefaultKeyboard(anaconda.rootPath) + default = anaconda.instLanguage.getDefaultKeyboard(anaconda.rootPath) if default not in keyboards: default = 'us' diff --git a/textw/language_text.py b/textw/language_text.py index 191a90d5d..bac78e4a3 100644 --- a/textw/language_text.py +++ b/textw/language_text.py @@ -30,18 +30,17 @@ log = logging.getLogger("anaconda") class LanguageWindow: def __call__(self, screen, anaconda): - id = anaconda.id - languages = id.instLanguage.available () + languages = anaconda.instLanguage.available () languages.sort() - current = id.instLanguage.instLang + current = anaconda.instLanguage.instLang height = min((8, len(languages))) buttons = [TEXT_OK_BUTTON, TEXT_BACK_BUTTON] translated = [] for lang in languages: - translated.append ((_(lang), id.instLanguage.getLangByName(lang))) + translated.append ((_(lang), anaconda.instLanguage.getLangByName(lang))) (button, choice) = \ ListboxChoiceWindow(screen, _("Language Selection"), _("What language would you like to use during the " @@ -52,19 +51,19 @@ class LanguageWindow: if button == TEXT_BACK_CHECK: return INSTALL_BACK - if id.instLanguage.getFontFile(choice) == "none": + if anaconda.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]) - id.instLanguage.instLang = choice - id.instLanguage.systemLang = choice - id.timezone.setTimezoneInfo(id.instLanguage.getDefaultTimeZone(anaconda.rootPath)) + anaconda.instLanguage.instLang = choice + anaconda.instLanguage.systemLang = choice + anaconda.id.timezone.setTimezoneInfo(anaconda.instLanguage.getDefaultTimeZone(anaconda.rootPath)) return INSTALL_OK - id.instLanguage.instLang = choice - id.instLanguage.systemLang = choice - id.timezone.setTimezoneInfo(id.instLanguage.getDefaultTimeZone(anaconda.rootPath)) + anaconda.instLanguage.instLang = choice + anaconda.instLanguage.systemLang = choice + anaconda.id.timezone.setTimezoneInfo(anaconda.instLanguage.getDefaultTimeZone(anaconda.rootPath)) anaconda.intf.drawFrame() diff --git a/textw/timezone_text.py b/textw/timezone_text.py index ab5ebe1bf..9d8dc2665 100644 --- a/textw/timezone_text.py +++ b/textw/timezone_text.py @@ -67,7 +67,7 @@ class TimezoneWindow: timezones = self.getTimezoneList() (default, asUtc) = anaconda.id.timezone.getTimezoneInfo() if not default: - default = anaconda.id.instLanguage.getDefaultTimeZone(anaconda.rootPath) + default = anaconda.instLanguage.getDefaultTimeZone(anaconda.rootPath) bb = ButtonBar(screen, [TEXT_OK_BUTTON, TEXT_BACK_BUTTON]) t = TextboxReflowed(30, |