Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

[lyx.git] / src / support / Messages.cpp

diff --git a/src/support/Messages.cpp b/src/support/Messages.cpp
index 5d2a554d83917cc0ae1b8a226e28d98e9acc2fc2..b1483d294ca1be8eca347d76ba1759641307fde2 100644 (file)
--- a/src/support/Messages.cpp
+++ b/src/support/Messages.cpp
@@ -17,7 +17,7 @@
 #include "support/Package.h"
 #include "support/unicode.h"
 
-#include <boost/assert.hpp>
+#include "support/assert.h"
 
 #include <cerrno>
 
@@ -60,7 +60,7 @@ void cleanTranslation(docstring & trans)
 #  if HAVE_GETTEXT
 #    include <libintl.h>      // use the header already in the system *EK*
 #  else
-#    include "../intl/libintl.h"
+#    include "../../intl/libintl.h"
 #  endif
 
 using namespace lyx::support;
@@ -111,8 +111,8 @@ docstring const Messages::get(string const & m) const
 
        // The string was not found, use gettext to generate it
 
-       string const oldLANGUAGE = getEnv("LANGUAGE");
-       string const oldLC_ALL = getEnv("LC_ALL");
+       static string const oldLANGUAGE = getEnv("LANGUAGE");
+       static string const oldLC_ALL = getEnv("LC_ALL");
        if (!lang_.empty()) {
                // This GNU extension overrides any language locale
                // wrt gettext.
@@ -158,7 +158,7 @@ docstring const Messages::get(string const & m) const
        pair<TranslationCache::iterator, bool> result =
                cache_.insert(make_pair(m, trans));
 
-       BOOST_ASSERT(result.second);
+       LASSERT(result.second, /**/);
 
        return result.first->second;
 }