Merge lp:~aber/widelands/0x0000000000000000 into lp:widelands

[David Allwicher]

I don't know if this code is semantically equivalent, but we need to make sure we don't access 0x0000000000000000.
So, i'm still not able to make a new widelands package. :'(
The problem is, if you start from the console, the console is your parent process and you have a different environment. So I did not notice this at first.

[Tino (tino79)]

Applied and checked on windows.
Compiles fine.
Packaged&installed Widelands still shows all languages and detects system language correctly.

review: Approve

=== modified file 'src/i18n.cc'
--- src/i18n.cc	2011-02-16 18:51:00 +0000
+++ src/i18n.cc	2011-02-22 18:52:38 +0000
@@ -116,16 +116,23 @@
  * Code inspired by wesnoth.org
  */
 void init_locale() {
+	env_locale = std::string();
 #ifdef _WIN32
-	env_locale = "";
 	locale = "English";
 	SETLOCALE(LC_ALL, "English");
 #else
 	// first, save environment variable
-	env_locale = getenv("LANG");
-	if (env_locale.empty())
-		env_locale = getenv("LANGUAGE");
-
+	char * lang;
+	lang = getenv("LANG");
+	if (lang != NULL) {
+		env_locale = lang;
+	}
+	if (env_locale.empty()) {
+		lang = getenv("LANGUAGE");
+		if (lang != NULL) {
+			env_locale = lang;
+		}
+	}
 	locale = "C";
 	SETLOCALE(LC_ALL, "C");
 	SETLOCALE(LC_MESSAGES, "");