* language.py: Use fixLang in a few more places. Set SYSFONT to

       selected lang's font in lang-table.  Modified getCurrent to return
       selected lang.

       * text.py (InstallInterface.run): The Language class handles the
       non-working languages for text mode.  Only call getFontFile to see
       if we should tell the user the selected lang won't work in text
       mode.

       * textw/language_text.py (LanguageWindow.__call__): None -> none

1 files changed, 5 insertions, 13 deletions

diff --git a/text.py b/text.py
index 7020ab5d6..5d4eb2d38 100644
--- a/text.py
+++ b/text.py
@@ -450,12 +450,12 @@ class InstallInterface:
         return True
 
     def run(self, id, dispatch):
-        oldlang = None
         if id.instLanguage.getFontFile(id.instLanguage.getCurrent()) == "none":
-            log.info("run:  setting default runtime language")
-            oldlang = id.instLanguage.getCurrent()
-            id.instLanguage.setRuntimeLanguage("en_US.UTF-8")
-            id.instLanguage.setRuntimeDefaults(oldlang)
+            ButtonChoiceWindow(self.screen, "Language Unavailable",
+                               "%s display is unavailable in text mode.  "
+                               "The installation will continue in "
+                               "English." % (oldlang,),
+                               buttons=[TEXT_OK_BUTTON])
         
 	self.screen.helpCallback(self.helpWindow)
 
@@ -476,14 +476,6 @@ class InstallInterface:
         # draw the frame after setting up the fallback
         self.drawFrame()
 
-        if oldlang is not None:
-            ButtonChoiceWindow(self.screen, "Language Unavailable",
-                               "%s display is unavailable in text mode.  "
-                               "The installation will continue in "
-                               "English." % (oldlang,),
-                               buttons=[TEXT_OK_BUTTON])
-        
-
         id.fsset.registerMessageWindow(self.messageWindow)
         id.fsset.registerProgressWindow(self.progressWindow)
         id.fsset.registerWaitWindow(self.waitWindow)