# HG changeset patch # User tron # Date 1121755692 0 # Node ID fa79f4b23d2c8522888bf490fc17b3d931735acf # Parent c86a863485eeda712896e3e8ed1b979e436e45c4 (svn r2632) Revert accidently commited change diff -r c86a863485ee -r fa79f4b23d2c strings.c --- a/strings.c Tue Jul 19 06:47:07 2005 +0000 +++ b/strings.c Tue Jul 19 06:48:12 2005 +0000 @@ -1078,32 +1078,13 @@ 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 @@ 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");