Fix traceback on setting language support in kickstart.

3 files changed, 18 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 08e8690d7..f2f6e90b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-01  Chris Lumens  <clumens@redhat.com>
+
+	* installclass.py (BaseInstallClass.setLanguageSupport):  Don't add
+	duplicate entries to supported list.
+	* language.py:  Fix traceback on kickstart language support.
+
 2005-04-01  Jeremy Katz  <katzj@redhat.com>
 
 	* scripts/upd-instroot: Lots of cleanup to try to get things
diff --git a/installclass.py b/installclass.py
index b50fa878f..379c84eb9 100644
--- a/installclass.py
+++ b/installclass.py
@@ -351,12 +351,14 @@ class BaseInstallClass:
 	else:
 	    newlist = []
 	    for lang in langlist:
-		newlist.append(id.instLanguage.getLangNameByNick(lang))
+		name = id.instLanguage.getLangNameByNick (lang)
+		if name not in newlist:
+		    newlist.append(name)
 
             default = id.instLanguage.getDefault()
             if default not in newlist:
                 newlist.append(default)
-                
+
 	    id.instLanguage.setSupported(newlist)
 
     def setLanguageDefault(self, id, default):
diff --git a/language.py b/language.py
index 82bb51a7b..031ffd02c 100644
--- a/language.py
+++ b/language.py
@@ -135,11 +135,13 @@ class Language:
         return self.nativeLangNames[lang]
 
     def getLangNameByNick(self, nick):
+	canonNick = self.canonLangNick (nick)
+
         try:
-            return self.localeInfo[nick][0]
+            return self.localeInfo[canonNick][0]
         except KeyError:
-            nick = self.canonLangNick (self.getCurrent())
-            return self.localeInfo[nick][0]
+            curNick = self.canonLangNick (self.getCurrent())
+            return self.localeInfo[curNick][0]
 
     def getFontFile (self, lang):
 	# Note: in /etc/fonts.cgz fonts are named by the map
@@ -185,7 +187,7 @@ class Language:
 
             return name
         else:
-            return 'English (USA)'
+            return 'English'
 
     def setDefault(self, nick):
 	if not nick:
@@ -198,13 +200,14 @@ class Language:
             row = self.langInfoByName[k]
             if nick in expandLangs(row[0]):
                 name = k
+                break
 
         # It's possible we didn't find a match.
         if name == None:
             self.default = None
             return
 
-	self.default = name
+	self.default = self.getLangNameByNick(nick)
 	(lang, map, font) = self.langInfoByName[name]
 
 	self.info['LANG'] = lang