tcsc fixes (53574)

2 files changed, 5 insertions, 2 deletions

diff --git a/language.py b/language.py
index bfae632b1..82e09f446 100644
--- a/language.py
+++ b/language.py
@@ -145,7 +145,8 @@ class InstallTimeLanguage:
         os.environ["RUNTIMELANG"] = lang
 
     def setRuntimeLanguage(self, name):
-        self.setRuntimeDefaults(name)
+        if not os.environ.has_key("RUNTIMELANG"):
+            self.setRuntimeDefaults(name)
         lang = self.langNicks[name]
 
         os.environ["LANG"] = lang
diff --git a/text.py b/text.py
index fe2cbf85c..0a5d8e924 100644
--- a/text.py
+++ b/text.py
@@ -337,7 +337,6 @@ class InstallInterface:
         self.screen = SnackScreen()
         self.configFileData = configFileData
 	self.screen.helpCallback(self.helpWindow)
-	self.drawFrame()
 
 # uncomment this line to make the installer quit on <Ctrl+Z>
 # handy for quick debugging.
@@ -366,6 +365,9 @@ class InstallInterface:
         self.langSearchPath = expandLangs(lang) + ['C']
         self.instLanguage = id.instLanguage
 
+        # draw the frame after setting up the fallback
+        self.drawFrame()
+
         id.fsset.registerMessageWindow(self.messageWindow)
         id.fsset.registerProgressWindow(self.progressWindow)
         id.fsset.registerWaitWindow(self.waitWindow)