X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgettext.C;h=aae9bc7f5c12b91b6e989775e99fda66c2b7484b;hb=b9963e1a57135c3e2ab128a9ec4300f0e4886992;hp=a27c579b421797b2421b2814915819c32bf54bec;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git

diff --git a/src/gettext.C b/src/gettext.C
index a27c579b42..aae9bc7f5c 100644
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -1,5 +1,5 @@
 /**
- * \file gettext.C
+ * \file src/gettext.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,16 +11,18 @@
 
 #include <config.h>
 
+#include "gettext.h"
 #include "messages.h"
-#include "LString.h"
-#include "support/LAssert.h"
-
-#include <boost/scoped_ptr.hpp>
+#include "support/environment.h"
 
 #ifdef HAVE_LOCALE_H
 #  include <locale.h>
 #endif
 
+using std::string;
+using lyx::support::setEnv;
+
+
 namespace {
 
 Messages & getLyXMessages()
@@ -43,6 +45,8 @@ string const _(string const & str)
 
 void locale_init()
 {
+	// Disable, as otherwise it overrides everything else incl. the doc language
+	setEnv("LANGUAGE", "");
 #  ifdef HAVE_LC_MESSAGES
 	setlocale(LC_MESSAGES, "");
 #  endif