Merge 1.0-seek and subtitle-content.

[dcpomatic.git] / src / lib / util.cc

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 2b6dd766e12840f00f5e38f494e50e763bd4da5c..ef203c2bdc82fae52119f0acef4b4d4c2ba27764 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -47,6 +47,7 @@
 #include <openssl/md5.h>
 #include <magick/MagickCore.h>
 #include <magick/version.h>
+#include <pangomm/init.h>
 #include <libdcp/version.h>
 #include <libdcp/util.h>
 #include <libdcp/signer_chain.h>
@@ -309,6 +310,7 @@ dcpomatic_setup ()
        setenv ("LTDL_LIBRARY_PATH", lib.c_str (), 1);
 #endif 
 
+       Pango::init ();
        libdcp::init ();
        
        Ratio::setup_ratios ();
@@ -350,6 +352,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, "");