Mercurial > hg > openttd

changeset 2122:27419e0213d7 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r2632) Revert accidently commited change
author tron <tron@openttd.org>
date Tue, 19 Jul 2005 06:48:12 +0000
parents 8a10fcb9efea
children 8d2e82a5ace6
files strings.c
diffstat 1 files changed, 2 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/strings.c
+++ b/strings.c
@@ -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");