From 3a51cc23de37ff0821009af780ef56e0e28394f7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 6 Jan 2014 13:23:28 +0000 Subject: [PATCH] Override LC_ALL as well as LANGUAGE and LANG when forcing locale. --- ChangeLog | 3 +++ src/lib/util.cc | 2 ++ 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index cda331368..8aa51761d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2014-01-06 Carl Hetherington + * 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, ""); -- 2.30.2