3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 40128825b..ac2006817 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-24  David Cantrell  <dcantrell@redhat.com>
+
+	* anaconda: If running text mode installer and missing $LANG, set
+	it to en_US.UTF-8 before firing off intf.
+
+	* language.py (Language.fixLang): Extra safety net for LANG=C.
+
 2006-02-24  Jeremy Katz  <katzj@redhat.com>
 
 	* bootdisk/i386/options.msg: Be clearer about askmethod (#182535)
diff --git a/anaconda b/anaconda
index de4574fe1..ffbcb2ecc 100755
--- a/anaconda
+++ b/anaconda
@@ -1078,6 +1078,9 @@ if (display_mode == 't'):
 if (display_mode == 'c'):
     from cmdline import InstallInterface
 
+if display_mode == "t":
+    if not os.environ.has_key("LANG"):
+        os.environ["LANG"] = "en_US.UTF-8"
 
 # go ahead and set up the interface
 intf = InstallInterface ()
diff --git a/language.py b/language.py
index 0a49a63c9..3667a62cb 100644
--- a/language.py
+++ b/language.py
@@ -115,7 +115,7 @@ class Language:
     def fixLang(self, langToFix):
         ret = None
 
-        if self.targetLang is not None:
+        if self.targetLang is not None or langToFix == "C":
             return langToFix
 
         if self.displayMode == "t":