Combined Language and InstallTimeLanguage in language.py into a single

class, updated the lang-table format to remove an unused column, and
changed langSupport to instLanguage everywhere to reinforce the class
merge idea.

2 files changed, 9 insertions, 9 deletions

diff --git a/iw/language_gui.py b/iw/language_gui.py
index bc8ad5bf4..71301a3d5 100644
--- a/iw/language_gui.py
+++ b/iw/language_gui.py
@@ -33,7 +33,7 @@ class LanguageWindow (InstallWindow):
             self.lang = self.listStore.get_value(iter, 1)
 
 	self.instLang.setRuntimeLanguage(self.lang)
-	self.ics.getICW().setLanguage (self.instLang.getLangNick(self.lang))
+	self.ics.getICW().setLanguage (self.instLang.getNickByName(self.lang))
 
         return None
 
@@ -74,10 +74,10 @@ class LanguageWindow (InstallWindow):
 
         for locale in instLang.available():
             iter = self.listStore.append()
+            nick = self.instLang.getNickByName(locale)
             lang = '%s (<span lang="%s">%s</span>)' % (
-                _(locale),
-                "%s" % (instLang.getLangNick(locale).split('.')[0],),
-                instLang.getNativeLangName(locale))
+                _(locale), "%s" % (nick.split('.')[0],),
+                self.instLang.getNativeLangName(locale))
             self.listStore.set_value(iter, 0, lang)
             self.listStore.set_value(iter, 1, locale)
             self.listStore.set_value(iter, 2, _(locale))
@@ -89,7 +89,7 @@ class LanguageWindow (InstallWindow):
         self.listView.append_column(col)
         self.listView.set_property("headers-visible", False)
 
-        current = instLang.getCurrent()
+        current = instLang.getLangNameByNick(instLang.getCurrent())
         iter = self.listStore.get_iter_first()
         while iter:
             if self.listStore.get_value(iter, 1) == current:
diff --git a/iw/package_gui.py b/iw/package_gui.py
index 9c017cfbf..2ff69de11 100644
--- a/iw/package_gui.py
+++ b/iw/package_gui.py
@@ -558,7 +558,7 @@ class PackageSelectionWindow (InstallWindow):
 	    if comp.id != "base":
 		comp.unselect ()
 		if comp.id == "everything":
-		    packages.selectLanguageSupportGroups(self.grpset, self.langSupport)
+		    packages.selectLanguageSupportGroups(self.grpset, self.instLanguage)
 
         if count:
             self.setCompCountLabel(comp, count)
@@ -593,7 +593,7 @@ class PackageSelectionWindow (InstallWindow):
 
 	    # turn on lang support if we're minimal and enabling
 	    if comp.id == "base" and newstate:
-		packages.selectLanguageSupportGroups(self.grpset, self.langSupport)
+		packages.selectLanguageSupportGroups(self.grpset, self.instLanguage)
 
 	    self.setComponentsSensitive(comp, not newstate)
 
@@ -915,13 +915,13 @@ class PackageSelectionWindow (InstallWindow):
 	
 	
 
-    def getScreen(self, grpset, langSupport, instClass, dispatch):
+    def getScreen(self, grpset, instLanguage, instClass, dispatch):
 
     # PackageSelectionWindow tag="sel-group"
         ICON_SIZE = 32
         
 	self.grpset = grpset
-	self.langSupport = langSupport
+	self.instLanguage = instLanguage
 	self.dispatch = dispatch
 
 	self.origSelection = self.grpset.getSelectionState()