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 b80792ac22e2936744bc5a99bf3f0d485a9c91d4..aae9bc7f5c12b91b6e989775e99fda66c2b7484b 100644 (file)
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -1,58 +1,52 @@
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- *        
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
+/**
+ * \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 Jean-Marc Lasgouttes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
+#include "gettext.h"
+#include "messages.h"
+#include "support/environment.h"
+
 #ifdef HAVE_LOCALE_H
 #  include <locale.h>
 #endif
 
-#include "LString.h"
+using std::string;
+using lyx::support::setEnv;
 
-#ifdef ENABLE_NLS
 
-#  if HAVE_GETTEXT
-#    include <libintl.h>      // use the header already in the system *EK*
-#  else
-#    include "../intl/libintl.h"
-#  endif
+namespace {
 
-char const * _(char const * str)
+Messages & getLyXMessages()
 {
-       // I'd rather have an Assert on str, we should not allow
-       // null pointers here. Lgb
-       // Assert(str);
-       if (str && str[0])
-               return gettext(str);
-       else
-               return "";
+       static Messages lyx_messages;
+
+       return lyx_messages;
 }
 
+} // anon namespace
 
-string const _(string const & str) 
+
+string const _(string const & str)
 {
-       if (!str.empty()) {
-               int const s = str.length();
-               char * tmp = new char[s + 1];
-               str.copy(tmp, s);
-               tmp[s] = '\0';
-               string const ret(gettext(tmp));
-               delete [] tmp;
-               return ret;
-       } else {
-               return string();
-       }
+       return getLyXMessages().get(str);
 }
 
+
+#ifdef ENABLE_NLS
+
 void locale_init()
 {
+       // Disable, as otherwise it overrides everything else incl. the doc language
+       setEnv("LANGUAGE", "");
 #  ifdef HAVE_LC_MESSAGES
        setlocale(LC_MESSAGES, "");
 #  endif
@@ -60,21 +54,11 @@ void locale_init()
        setlocale(LC_NUMERIC, "C");
 }
 
-void gettext_init(string const & localedir)
-{
-       bindtextdomain(PACKAGE, localedir.c_str()); 
-       textdomain(PACKAGE);
-}
-
-
 #else // ENABLE_NLS
 
 void locale_init()
-{
-}
-
-void gettext_init(string const &)
 {
        setlocale(LC_NUMERIC, "C");
 }
+
 #endif