X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgettext.C;h=925e433363d50ab80972a4c4c70d3f5df129db64;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=9e48e11d0a77d46f8b181dae463dd7f82ae92ca0;hpb=44cd0fc9a1687cc63911c7f98d978594458e7813;p=lyx.git

diff --git a/src/gettext.C b/src/gettext.C
index 9e48e11d0a..925e433363 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.
  *
@@ -13,18 +13,23 @@
 
 #include "gettext.h"
 #include "messages.h"
+#include "support/environment.h"
 
 
+namespace lyx {
+
 #ifdef HAVE_LOCALE_H
 #  include <locale.h>
 #endif
 
+using support::setEnv;
+
 using std::string;
 
 
 namespace {
 
-Messages & getLyXMessages()
+static Messages & getLyXMessages()
 {
 	static Messages lyx_messages;
 
@@ -34,7 +39,7 @@ Messages & getLyXMessages()
 } // anon namespace
 
 
-string const _(string const & str)
+docstring const _(string const & str)
 {
 	return getLyXMessages().get(str);
 }
@@ -44,6 +49,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
@@ -59,3 +66,6 @@ void locale_init()
 }
 
 #endif
+
+
+} // namespace lyx