diff options
| author | sopwith <sopwith> | 2005-04-07 00:44:33 +0000 |
|---|---|---|
| committer | sopwith <sopwith> | 2005-04-07 00:44:33 +0000 |
| commit | 1b94fbafeea695c8cfd07c2b46561fad31259591 (patch) | |
| tree | c05dd2bcc26f399393b73441f2d0707013f9a114 | |
| parent | ef59be828b0b91fbfc19f23e0cc0d2617cb7a6bf (diff) | |
| download | anaconda-1b94fbafeea695c8cfd07c2b46561fad31259591.tar.gz anaconda-1b94fbafeea695c8cfd07c2b46561fad31259591.tar.xz anaconda-1b94fbafeea695c8cfd07c2b46561fad31259591.zip | |
Fix a bug with language selection in text-mode install.anaconda-10.2.0.44-1
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | anaconda.spec | 6 | ||||
| -rw-r--r-- | textw/language_text.py | 6 |
3 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,8 @@ +2005-04-06 Elliot Lee <sopwith@redhat.com> + + * textw/language_text.py: The language display is now in English names instead of nicknames - make this + a reality in more of the code. + 2005-04-06 Chris Lumens <clumens@redhat.com> * language.py (Language.setDefault): Don't set SYSFONTACM. diff --git a/anaconda.spec b/anaconda.spec index d37555035..c7bb05655 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.2.0.43 +Version: 10.2.0.44 Release: 1 License: GPL Summary: Graphical system installer @@ -69,6 +69,10 @@ rm -rf $RPM_BUILD_ROOT /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Wed Apr 6 2005 Elliot Lee <sopwith@redhat.com> - 10.2.0.44-1 +- Deal with text-mode language traceback +- (clumens) Don't set SYSFONTACM + * Wed Apr 06 2005 Peter Jones <pjones@redhat.com> - 10.2.0.43-1 - Don't remove libraries in stage2 that don't match the one from linuxthreads/ diff --git a/textw/language_text.py b/textw/language_text.py index 11eea927c..98cb0db3f 100644 --- a/textw/language_text.py +++ b/textw/language_text.py @@ -33,7 +33,7 @@ class LanguageWindow: translated = [] for lang in languages: - translated.append (_(lang)) + translated.append ((_(lang), instLanguage.getNickByName(lang))) (button, choice) = \ ListboxChoiceWindow(screen, _("Language Selection"), _("What language would you like to use during the " @@ -44,8 +44,6 @@ class LanguageWindow: if button == TEXT_BACK_CHECK: return INSTALL_BACK - choice = languages[choice] - if ((instLanguage.getFontFile(choice) == "None")): ButtonChoiceWindow(screen, "Language Unavailable", "%s display is unavailable in text mode. The " @@ -53,7 +51,7 @@ class LanguageWindow: buttons=[TEXT_OK_BUTTON]) instLanguage.setRuntimeDefaults(choice) return INSTALL_OK - + if (flags.setupFilesystems and instLanguage.getFontFile(choice) == "bterm" and not flags.serial and not flags.virtpconsole |