Alfredo's second patch

[lyx.git] / src / gettext.C

diff --git a/src/gettext.C b/src/gettext.C
index e65081c71cd10a286db1ce4881e7e0006d27825f..6165efb3fbb91e3938d5585a3137e2bab97f879c 100644 (file)
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -10,49 +10,42 @@
 
 #include <config.h>
 
+#include "messages.h"
+#include "LString.h"
+#include "support/LAssert.h"
+
+#include <boost/scoped_ptr.hpp>
+
 #ifdef HAVE_LOCALE_H
 #  include <locale.h>
 #endif
 
-#include "LString.h"
+namespace {
+
+Messages & getLyXMessages()
+{
+       static Messages lyx_messages;
 
-#include <boost/smart_ptr.hpp>
+       return lyx_messages;
+}
 
-#ifdef ENABLE_NLS
+} // anon namespace
 
-#  if HAVE_GETTEXT
-#    include <libintl.h>      // use the header already in the system *EK*
-#  else
-#    include "../intl/libintl.h"
-#  endif
 
 char const * _(char const * str)
 {
-       // 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 "";
+       return getLyXMessages().get(str).c_str();
 }
 
 
 string const _(string const & str)
 {
-       if (!str.empty()) {
-               int const s = str.length();
-               boost::scoped_array<char> tmp(new char[s + 1]);
-               str.copy(tmp.get(), s);
-               tmp[s] = '\0';
-               string const ret(gettext(tmp.get()));
-               return ret;
-       } else {
-               return string();
-       }
+       return getLyXMessages().get(str);
 }
 
 
+#ifdef ENABLE_NLS
+
 void locale_init()
 {
 #  ifdef HAVE_LC_MESSAGES
@@ -62,14 +55,6 @@ 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()
@@ -77,8 +62,4 @@ void locale_init()
        setlocale(LC_NUMERIC, "C");
 }
 
-
-void gettext_init(string const &)
-{
-}
 #endif