[Libreoffice-commits] core.git: vcl/source vcl/unx

[Caolán McNamara]

 vcl/source/app/svmain.cxx |   11 -----------
 vcl/unx/gtk/gtkinst.cxx   |    6 ++++++
 2 files changed, 6 insertions(+), 11 deletions(-)

New commits:
commit d412e969e103253bbc74df8ead9fe3d67ddb53a0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue May 30 12:22:00 2017 +0100

    Revert "make LANGUAGE setting universal, not just gtk specific"
    
    poxy cppunit tests can't use config here
    
    This reverts commit f55eeb7a45998d16eb0fe49088e172ce45ac4f2b.

diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 0e0a2a9bbbff..2a89d80f60f3 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -318,17 +318,6 @@ bool InitVCL()
         // soffice/sfx implementation creates the global service manager
         pSVData->mpApp->Init();
 
-    //Now that uno has been bootstrapped we can ask the config what the UI language is so that we can
-    //force that in as $LANGUAGE. That way we can get gtk to render widgets RTL
-    //if we have a RTL UI in an otherwise LTR locale and get gettext using externals (e.g. python)
-    //to match their translations to our preferred UI language
-    OUString aLocaleString(Application::GetSettings().GetUILanguageTag().getGlibcLocaleString(".UTF-8"));
-    if (!aLocaleString.isEmpty())
-    {
-        OUString envVar("LANGUAGE");
-        osl_setEnvironment(envVar.pData, aLocaleString.pData);
-    }
-
     pSVData->mpDefInst->AfterAppInit();
 
     // Fetch AppFileName and make it absolute before the workdir changes...
diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx
index a22ea9c93f87..e01a267b6131 100644
--- a/vcl/unx/gtk/gtkinst.cxx
+++ b/vcl/unx/gtk/gtkinst.cxx
@@ -167,6 +167,12 @@ GtkInstance::GtkInstance( SalYieldMutex* pMutex )
 //UI in a LTR locale
 void GtkInstance::AfterAppInit()
 {
+    OUString aLocaleString(Application::GetSettings().GetUILanguageTag().getGlibcLocaleString(".UTF-8"));
+    if (!aLocaleString.isEmpty())
+    {
+        OUString envVar("LANGUAGE");
+        osl_setEnvironment(envVar.pData, aLocaleString.pData);
+    }
     EnsureInit();
 }