mirror of https://github.com/OpenTTD/OpenTTD
(svn r2632) Revert accidently commited change
parent
28a6e10a63
commit
bbc4c5fc34
25
strings.c
25
strings.c
|
@ -1078,32 +1078,13 @@ void InitializeLanguagePacks(void)
|
||||||
int n;
|
int n;
|
||||||
int m;
|
int m;
|
||||||
int def;
|
int def;
|
||||||
int fallback;
|
|
||||||
LanguagePack hdr;
|
LanguagePack hdr;
|
||||||
FILE *in;
|
FILE *in;
|
||||||
char *files[32];
|
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));
|
n = GetLanguageList(files, lengthof(files));
|
||||||
|
|
||||||
def = -1;
|
def = 0; // default language file
|
||||||
fallback = 0;
|
|
||||||
|
|
||||||
// go through the language files and make sure that they are valid.
|
// go through the language files and make sure that they are valid.
|
||||||
for (i = m = 0; i != n; i++) {
|
for (i = m = 0; i != n; i++) {
|
||||||
|
@ -1123,12 +1104,10 @@ void InitializeLanguagePacks(void)
|
||||||
dl->ent[m].file = files[i];
|
dl->ent[m].file = files[i];
|
||||||
dl->ent[m].name = strdup(hdr.name);
|
dl->ent[m].name = strdup(hdr.name);
|
||||||
|
|
||||||
if (strcmp(hdr.name, "English") == 0) fallback = m;
|
if (strcmp(hdr.name, "English") == 0) def = m;
|
||||||
if (strcmp(hdr.isocode, lang) == 0) def = m;
|
|
||||||
|
|
||||||
m++;
|
m++;
|
||||||
}
|
}
|
||||||
if (def == -1) def = fallback;
|
|
||||||
|
|
||||||
if (m == 0)
|
if (m == 0)
|
||||||
error(n == 0 ? "No available language packs" : "Invalid version of language packs");
|
error(n == 0 ? "No available language packs" : "Invalid version of language packs");
|
||||||
|
|
Loading…
Reference in New Issue