summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--loader2/lang.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 79faf5b66..50549cbf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-23 Chris Lumens <clumens@redhat.com>
+
+ * loader2/lang.c (setupLanguage): Make sure to set the language to
+ English every time if it's unsupported (#203331).
+
2006-08-23 Peter Jones <pjones@redhat.com>
* dmraid.py: don't clobber bdevid search path with "/lib/"
diff --git a/loader2/lang.c b/loader2/lang.c
index e019828ef..34d834f67 100644
--- a/loader2/lang.c
+++ b/loader2/lang.c
@@ -50,6 +50,8 @@ struct aString {
struct aString * strings = NULL;
int numStrings = 0, allocedStrings = 0;
+static int english = 0;
+
static char * topLineWelcome = N_("Welcome to %s");
static char * topLineWelcomeRescue = N_("Welcome to %s - Rescue Mode");
static char * bottomHelpLine = N_(" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen ");
@@ -239,6 +241,7 @@ static int setupLanguage(int choice) {
"installation will continue in English until the "
"display of %s is possible.", languages[choice].lang,
languages[choice].lang);
+ setLangEnv(english);
return 0;
}
@@ -334,7 +337,6 @@ int chooseLanguage(char ** lang) {
int choice = 0;
char ** langs;
int i;
- int english = 0;
int current = -1;
char * currentLangName = getenv("LANG");
int numLangs = 0;