GTK graphics dialog: Default to scaling 100% when no scaling or size is given

[lyx.git] / src / gettext.C

diff --git a/src/gettext.C b/src/gettext.C
index 7bc80b4f7b0fa31c566fb54860617567e6f694f9..aae9bc7f5c12b91b6e989775e99fda66c2b7484b 100644 (file)
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -1,26 +1,28 @@
 /**
- * \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.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #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