Merge lp:~widelands-dev/widelands/bug-1798297-locale-C into lp:widelands

[GunChleoc]

Fix fetching of translations when user locale is set to C. If the desired Widelands locale does not exist, try to fall back to en_US.utf8 to make libintl happy.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4193. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/452673990.
Appveyor build 3989. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1798297_locale_C-3989.

[lp:~widelands-dev/widelands/bug-1798297-locale-C]

8909. By GunChleoc on 2018-11-16

Merged trunk.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4235. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/455848130.
Appveyor build 4031. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1798297_locale_C-4031.

[Arty (artydent)]

Code LGTM, just some minor indentation irregularities (see comments below).

Not tested because I don't have a working Linux system atm.

[GunChleoc (gunchleoc)]

I tested this pretty thoroughly on Linux, so it should be fine.

Bunnybot will take care of the indentation.

Thanks for the review! :)

@bunnybot merge

[bunnybot (widelandsofficial)]

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 4235. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/455848130.

[GunChleoc (gunchleoc)]

Transient failure on Travis

@bunnybot merge force

=== modified file 'src/base/i18n.cc'
--- src/base/i18n.cc	2018-08-12 06:47:11 +0000
+++ src/base/i18n.cc	2018-11-16 06:30:53 +0000
@@ -290,15 +290,26 @@
 		found = alt_str.find(',', 0);
 	}
 	if (leave_while) {
-		setenv("LANG", locale.c_str(), 1);
+		setenv("LC_ALL", locale.c_str(), 1);
+        setenv("LANG", locale.c_str(), 1);
 		setenv("LANGUAGE", locale.c_str(), 1);
 	} else {
-		log("No corresponding locale found - trying to set it via LANGUAGE=%s, LANG=%s\n",
-		    lang.c_str(), lang.c_str());
+		log("No corresponding locale found\n");
+        log(" - Set LANGUAGE, LANG and LC_ALL to '%s'\n",
+		    lang.c_str());
+
 		setenv("LANGUAGE", lang.c_str(), 1);
 		setenv("LANG", lang.c_str(), 1);
-		SETLOCALE(LC_MESSAGES, "");  // set locale according to the env. variables
-		                             // --> see  $ man 3 setlocale
+        setenv("LC_ALL", lang.c_str(), 1);
+
+        try {
+            SETLOCALE(LC_MESSAGES, "en_US.utf8");  // set locale according to the env. variables
+                                         // --> see  $ man 3 setlocale
+            log(" - Set system locale to 'en_US.utf8' to make '%s' accessible to libintl\n", lang.c_str());
+        } catch (std::exception&) {
+            SETLOCALE(LC_MESSAGES, "");  // set locale according to the env. variables
+                                         // --> see  $ man 3 setlocale
+        }
 		// assume that it worked
 		// maybe, do another check with the return value (?)
 		locale = lang;