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 d9f86c238fd6de2d19eca3c427f37e79766a541e..aae9bc7f5c12b91b6e989775e99fda66c2b7484b 100644 (file)
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -1,59 +1,43 @@
-/* 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
 
-namespace {
-
-boost::scoped_ptr<Messages> lyx_messages;
+using std::string;
+using lyx::support::setEnv;
 
-} // anon namespace
 
+namespace {
 
-char const * _(char const * str)
+Messages & getLyXMessages()
 {
-       // This breaks pretty much immediately
-       // lyx::Assert(str && str[0]);
+       static Messages lyx_messages;
 
-       if (!lyx_messages.get())
-               return str;
-
-       return lyx_messages->get(str).c_str();
+       return lyx_messages;
 }
 
-
-string const _(string const & str)
-{
-       // This breaks pretty much immediately
-       // lyx::Assert(!str.empty());
-
-       if (!lyx_messages.get())
-               return str;
-
-       return lyx_messages->get(str);
-}
+} // anon namespace
 
 
-void gettext_init(string const & localedir)
+string const _(string const & str)
 {
-       lyx_messages.reset(new Messages("", localedir));
+       return getLyXMessages().get(str);
 }
 
 
@@ -61,6 +45,8 @@ void gettext_init(string const & localedir)
 
 void locale_init()
 {
+       // Disable, as otherwise it overrides everything else incl. the doc language
+       setEnv("LANGUAGE", "");
 #  ifdef HAVE_LC_MESSAGES
        setlocale(LC_MESSAGES, "");
 #  endif