diff options
| author | Matt Wilson <msw@redhat.com> | 2001-09-10 16:14:02 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 2001-09-10 16:14:02 +0000 |
| commit | 1714d9979b5d81c4dbf5582a5bd99f2257f9ea16 (patch) | |
| tree | 5a9f72abf9ae55f7ef8676fd2da9e15263d2ef29 | |
| parent | 1a296bf72a24610a881640fcf584398fe8c7a4a0 (diff) | |
| download | anaconda-1714d9979b5d81c4dbf5582a5bd99f2257f9ea16.tar.gz anaconda-1714d9979b5d81c4dbf5582a5bd99f2257f9ea16.tar.xz anaconda-1714d9979b5d81c4dbf5582a5bd99f2257f9ea16.zip | |
fix notting's spot of bad message when trying to load japanese if we don't have kon
| -rw-r--r-- | loader/lang.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/loader/lang.c b/loader/lang.c index 2fa4b0c44..d9f3c2d82 100644 --- a/loader/lang.c +++ b/loader/lang.c @@ -201,7 +201,7 @@ static int loadFont(char * fontFile, int flags) { gzFile stream; int rc; - if (!strcmp(fontFile, "None")) return 0; + if (!strcmp(fontFile, "None") || !strcmp(fontFile, "Kon")) return 0; #if 0 if (!FL_TESTING(flags)) { #endif @@ -319,8 +319,9 @@ int chooseLanguage(char ** lang, int flags) { /* only set the environment variables when we actually have a way to display the language */ - if ((!strcmp (languages[choice].font, "Kon") && haveKon) || - (strcmp (languages[choice].font, "None"))) { + if ((!strcmp(languages[choice].font, "Kon") && haveKon) || + (strcmp(languages[choice].font, "None") && + strcmp(languages[choice].font, "Kon"))) { setenv("LANG", languages[choice].lc_all, 1); setenv("LANGKEY", languages[choice].key, 1); setenv("LC_ALL", languages[choice].lc_all, 1); @@ -351,8 +352,10 @@ int chooseLanguage(char ** lang, int flags) { } /* load the language only if it is displayable */ - if ((!strcmp (languages[choice].font, "Kon") && haveKon) || - (strcmp (languages[choice].font, "None"))) { + /* If we need kon and have it, or if it's not kon or none, load the lang */ + if ((!strcmp(languages[choice].font, "Kon") && haveKon) || + (strcmp(languages[choice].font, "None") && + strcmp(languages[choice].font, "Kon"))) { loadLanguage (NULL, flags); } else { newtWinMessage("Language Unavailable", "OK", |