From: Carl Hetherington <cth@carlh.net>
Date: Mon, 6 Jan 2014 13:23:28 +0000 (+0000)
Subject: Override LC_ALL as well as LANGUAGE and LANG when forcing locale.
X-Git-Tag: v2.0.48~983
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=3a51cc23de37ff0821009af780ef56e0e28394f7;p=dcpomatic.git

Override LC_ALL as well as LANGUAGE and LANG when forcing locale.
---

diff --git a/ChangeLog b/ChangeLog
index cda331368..8aa51761d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-01-06  Carl Hetherington  <cth@carlh.net>
 
+	* Make sure forced languages override the environment for gettext()
+	as well as wxWidgets' i18n code (#108).
+
 	* Bump libdcp version to get a fix for VOLINDEX/ASSETMAP file extensions
 	with interop (#206).
 
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 32b1805be..edb202df2 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -350,6 +350,8 @@ dcpomatic_setup_gettext_i18n (string lang)
 		putenv (cmd);
 		snprintf (cmd, sizeof(cmd), "LANG=%s", lang.c_str ());
 		putenv (cmd);
+		snprintf (cmd, sizeof(cmd), "LC_ALL=%s", lang.c_str ());
+		putenv (cmd);
 	}
 
 	setlocale (LC_ALL, "");