Remove dummy gettext.cpp from tex2lyx source and use a dummy message

object instead.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30505 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 801e68761991b47184c92ffb5fdb2ae97bb56977..eb50ecfccdc241060941415121c513181bd769bf 100644 (file)
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -595,7 +595,6 @@ src_tex2lyx_files = Split('''
     boost.cpp
     Context.cpp
     Font.cpp
-    gettext.cpp
     math.cpp
     Parser.cpp
     preamble.cpp

diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index 8f53955bf6db767ff573c1f2cb76ce8c6f886e12..a6bf7b657680eb2924ae514ba34d106a64f360e9 100644 (file)
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -58,7 +58,6 @@ tex2lyx_SOURCES = \
        Context.h \
        Font.cpp \
        Font.h \
-       gettext.cpp \
        Parser.cpp \
        Parser.h \
        tex2lyx.cpp \
@@ -70,6 +69,6 @@ tex2lyx_SOURCES = \
 
 tex2lyx_LDADD = \
        $(top_builddir)/src/support/liblyxsupport.a \
-       $(LIBICONV) $(BOOST_LIBS) \
+       $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) \
        $(QT4_LIB) $(QT4_LDFLAGS) \
        @LIBS@ $(LIBSHLWAPI) $(LIBPSAPI)

diff --git a/src/tex2lyx/gettext.cpp b/src/tex2lyx/gettext.cpp
deleted file mode 100644 (file)
index 3dfb596..0000000
--- a/src/tex2lyx/gettext.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * \file tex2lyx/gettext.cpp
- * 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 "support/gettext.h"
-#include "../support/docstring.h"
-
-using namespace std;
-
-namespace lyx {
-
-
-docstring const _(string const & str)
-{
-       return from_ascii(str);
-}
-
-
-void locale_init()
-{}
-
-
-} // namespace lyx

diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp
index be07d4c7ccd55a18de3aed51e11133c82477e283..c27f0c0886e8217e8b29973e441adf2d5c9147ff 100644 (file)
--- a/src/tex2lyx/tex2lyx.cpp
+++ b/src/tex2lyx/tex2lyx.cpp
@@ -25,6 +25,7 @@
 #include "support/filetools.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
+#include "support/Messages.h"
 #include "support/os.h"
 #include "support/Package.h"
 
@@ -41,6 +42,20 @@ using namespace lyx::support::os;
 
 namespace lyx {
 
+// Dummy translation support
+Messages messages_;
+Messages & getMessages(std::string const &)
+{
+       return messages_;
+}
+
+
+Messages & getGuiMessages()
+{
+       return messages_;
+}
+
+
 string const trim(string const & a, char const * p)
 {
        // LASSERT(p, /**/);