From ea268a9a5c8eeb55c53a0849673d273ca4c79fe0 Mon Sep 17 00:00:00 2001 From: sopwith Date: Thu, 7 Apr 2005 02:14:24 +0000 Subject: sync --- ChangeLog | 1 + anaconda.spec | 5 ++++- iw/language_gui.py | 7 ++++--- language.py | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index bfdde9c19..ed483d237 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ * textw/language_text.py: The language display is now in English names instead of nicknames - make this a reality in more of the code. + * iw/language_gui.py: Ditto 2005-04-06 Chris Lumens diff --git a/anaconda.spec b/anaconda.spec index c7bb05655..4465d34ef 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.2.0.44 +Version: 10.2.0.45 Release: 1 License: GPL Summary: Graphical system installer @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Wed Apr 6 2005 Elliot Lee 10.2.0.45-1 +- Deal with GUI-mode language traceback + * Wed Apr 6 2005 Elliot Lee - 10.2.0.44-1 - Deal with text-mode language traceback - (clumens) Don't set SYSFONTACM diff --git a/iw/language_gui.py b/iw/language_gui.py index 71301a3d5..70f619c5e 100644 --- a/iw/language_gui.py +++ b/iw/language_gui.py @@ -29,11 +29,12 @@ class LanguageWindow (InstallWindow): def getNext (self): (model, iter) = self.listView.get_selection().get_selected() - if iter: - self.lang = self.listStore.get_value(iter, 1) + assert iter, "No selection found on language list!" + choice = self.listStore.get_value(iter, 1) + self.lang = self.instLang.getNickByName(choice) self.instLang.setRuntimeLanguage(self.lang) - self.ics.getICW().setLanguage (self.instLang.getNickByName(self.lang)) + self.ics.getICW().setLanguage (self.lang) return None diff --git a/language.py b/language.py index f69d33b30..a18561240 100644 --- a/language.py +++ b/language.py @@ -133,7 +133,7 @@ class Language: row = self.localeInfo[k] if row[0] == name: return k - + def getNativeLangName(self, lang): return self.nativeLangNames[lang] -- cgit