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 6165efb3fbb91e3938d5585a3137e2bab97f879c..aae9bc7f5c12b91b6e989775e99fda66c2b7484b 100644 (file)
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -1,25 +1,28 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file src/gettext.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * 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()
@@ -32,12 +35,6 @@ Messages & getLyXMessages()
 } // anon namespace
 
 
-char const * _(char const * str)
-{
-       return getLyXMessages().get(str).c_str();
-}
-
-
 string const _(string const & str)
 {
        return getLyXMessages().get(str);
@@ -48,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