Don't set the list of supported languages in Language.__init__ by default.

Instead, only set this list in the install interfaces if kickstart hasn't
taken care of it already.

3 files changed, 11 insertions, 4 deletions

diff --git a/gui.py b/gui.py
index 5494682be..ac945c5a4 100755
--- a/gui.py
+++ b/gui.py
@@ -761,7 +761,11 @@ class InstallInterface:
         id.fsset.registerMessageWindow(self.messageWindow)
         id.fsset.registerProgressWindow(self.progressWindow)
         id.fsset.registerWaitWindow(self.waitWindow)
-        id.instLanguage.setSupported([id.instLanguage.getDefault()])
+
+        # Don't set if kickstart already set up a supported lang list.
+        if not id.instLanguage.getSupported():
+            id.instLanguage.setSupported([id.instLanguage.getDefault()])
+
         parted.exception_set_handler(partedExceptionWindow)
 
         self.icw = InstallControlWindow (self, self.dispatch, id)
diff --git a/language.py b/language.py
index b2ca0547a..caf30f4b0 100644
--- a/language.py
+++ b/language.py
@@ -116,7 +116,6 @@ class Language:
         # Set the language for anaconda to be using based on current $LANG.
         self.setRuntimeLanguage(self.current)
         self.setDefault(self.current)
-        self.setSupported([self.current])
 
     # Convert what might be a shortened form of a language's nick (en or
     # en_US, for example) into the full version (en_US.UTF-8).  If we
diff --git a/text.py b/text.py
index 3ecfb7153..ddee3ac9c 100644
--- a/text.py
+++ b/text.py
@@ -436,8 +436,12 @@ class InstallInterface:
         id.fsset.registerMessageWindow(self.messageWindow)
         id.fsset.registerProgressWindow(self.progressWindow)
         id.fsset.registerWaitWindow(self.waitWindow)        
-        id.instLanguage.setSupported([id.instLanguage.getDefault()])
-        parted.exception_set_handler(self.partedExceptionWindow)        
+
+        # Don't set if kickstart already set up a supported lang list.
+        if not id.instLanguage.getSupported():
+            id.instLanguage.setSupported([id.instLanguage.getDefault()])
+
+	parted.exception_set_handler(self.partedExceptionWindow)        
         
 	lastrc = INSTALL_OK
 	(step, args) = dispatch.currentStep()