From 6500fd2b91dfbf4382c72ccb4d474c52f7fd541d Mon Sep 17 00:00:00 2001 From: tron Date: Tue, 19 Jul 2005 06:48:12 +0000 Subject: [PATCH] (svn r2632) Revert accidently commited change --- strings.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/strings.c b/strings.c index 86b47824ac..dba6f79f40 100644 --- a/strings.c +++ b/strings.c @@ -1078,32 +1078,13 @@ void InitializeLanguagePacks(void) int n; int m; int def; - int fallback; LanguagePack hdr; FILE *in; char *files[32]; - uint j; - - char lang[] = "en"; - static const char* env[] = { - "LANGUAGE", - "LC_ALL", - "LC_MESSAGES", - "LANG" - }; - - for (j = 0; j < lengthof(env); j++) { - const char* envlang = getenv(env[j]); - if (envlang != NULL) { - snprintf(lang, lengthof(lang), "%.2s", envlang); - break; - } - } n = GetLanguageList(files, lengthof(files)); - def = -1; - fallback = 0; + def = 0; // default language file // go through the language files and make sure that they are valid. for (i = m = 0; i != n; i++) { @@ -1123,12 +1104,10 @@ void InitializeLanguagePacks(void) dl->ent[m].file = files[i]; dl->ent[m].name = strdup(hdr.name); - if (strcmp(hdr.name, "English") == 0) fallback = m; - if (strcmp(hdr.isocode, lang) == 0) def = m; + if (strcmp(hdr.name, "English") == 0) def = m; m++; } - if (def == -1) def = fallback; if (m == 0) error(n == 0 ? "No available language packs" : "Invalid version of language packs");