diff options
| author | Chris Lumens <clumens@redhat.com> | 2009-08-28 11:15:00 -0400 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2009-09-02 10:35:19 -0400 |
| commit | 3f97f7795203fa21eb450c45537ab6da74c661aa (patch) | |
| tree | 35e9a50f1c799d90e98c48651eed8d4105e7e48e /textw | |
| parent | 966175a6262407e86fa98e5b43b1556e324a4b1f (diff) | |
| download | anaconda-3f97f7795203fa21eb450c45537ab6da74c661aa.tar.gz anaconda-3f97f7795203fa21eb450c45537ab6da74c661aa.tar.xz anaconda-3f97f7795203fa21eb450c45537ab6da74c661aa.zip | |
Simplify language.py to two basic settings, and a lot of support (#517569).
There's now just two important settings in the Language module: instLang,
which is the language used while anaconda is running; and systemLang, which
is the language the installed system itself will use. These two can be
different mainly due to anaconda's text mode interface. The rest of anaconda
should only set and get these two. All the other support functions still
exist for grabbing timezone, font, etc.
Diffstat (limited to 'textw')
| -rw-r--r-- | textw/language_text.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/textw/language_text.py b/textw/language_text.py index 8b920b5e6..ec9fcd142 100644 --- a/textw/language_text.py +++ b/textw/language_text.py @@ -34,14 +34,14 @@ class LanguageWindow: languages = id.instLanguage.available () languages.sort() - current = id.instLanguage.getCurrent() + current = id.instLanguage.instLang height = min((8, len(languages))) buttons = [TEXT_OK_BUTTON, TEXT_BACK_BUTTON] translated = [] for lang in languages: - translated.append ((_(lang), id.instLanguage.getNickByName(lang))) + translated.append ((_(lang), id.instLanguage.getLangByName(lang))) (button, choice) = \ ListboxChoiceWindow(screen, _("Language Selection"), _("What language would you like to use during the " @@ -57,12 +57,13 @@ class LanguageWindow: "%s display is unavailable in text mode. The " "installation will continue in English." % (choice,), buttons=[TEXT_OK_BUTTON]) - id.instLanguage.setRuntimeDefaults(choice) + id.instLanguage.instLang = choice + id.instLanguage.systemLang = choice id.timezone.setTimezoneInfo(id.instLanguage.getDefaultTimeZone()) return INSTALL_OK - id.instLanguage.setRuntimeLanguage(choice) - id.instLanguage.setDefault(choice) + id.instLanguage.instLang = choice + id.instLanguage.systemLang = choice id.timezone.setTimezoneInfo(id.instLanguage.getDefaultTimeZone()) anaconda.intf.drawFrame() |