#include "support/debug.h"
#include "support/docstring.h"
#include "support/environment.h"
+#include "support/lstrings.h"
#include "support/Package.h"
#include "support/unicode.h"
// Instanciate static member.
string Messages::main_lang_;
-namespace {
-
void cleanTranslation(docstring & trans)
{
/*
}
}
-} // anonymous
} // lyx
# 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;
int e = errno;
if (e) {
LYXERR(Debug::LOCALE, "Error code: " << errno << '\n'
- << "Directory : " << package().locale_dir().absFilename() << '\n'
+ << "Directory : " << package().locale_dir().absFileName() << '\n'
<< "Rtn value : " << c);
}
}
+bool Messages::available() const
+{
+ string const test = languageTestString();
+ string const trans = to_utf8(get(test));
+ return !trans.empty() && trans != test;
+}
+
+
docstring const Messages::get(string const & m) const
{
if (m.empty())
// The string was not found, use gettext to generate it
static string oldLC_ALL;
+ static string oldLANGUAGE;
if (!lang_.empty()) {
oldLC_ALL = getEnv("LC_ALL");
// This GNU extension overrides any language locale
// wrt gettext.
LYXERR(Debug::LOCALE, "Setting LANGUAGE to " << lang_);
+ oldLANGUAGE = getEnv("LANGUAGE");
if (!setEnv("LANGUAGE", lang_))
LYXERR(Debug::LOCALE, "\t... failed!");
// However, setting LANGUAGE does nothing when the
#endif
}
+ // FIXME: gettext sometimes "forgets" the ucs4_codeset we set
+ // in init(), which leads to severe message corruption (#7371)
+ // We set it again here unconditionally. A real fix must be found!
+ LASSERT(bind_textdomain_codeset(PACKAGE, ucs4_codeset), /**/);
+
char const * m_c = m.c_str();
char const * trans_c = gettext(m_c);
docstring trans;
- if (!trans_c)
- LYXERR(Debug::LOCALE, "Undefined result from gettext");
- else if (trans_c == m_c) {
+ if (!trans_c) {
+ LYXERR(Debug::LOCALE, "Undefined result from gettext for `" << m << "'.");
+ trans = from_ascii(m);
+ } else if (trans_c == m_c) {
//LYXERR(Debug::LOCALE, "Same as entered returned");
trans = from_ascii(m);
} else {
// Reset environment variables as they were.
if (!lang_.empty()) {
// Reset everything as it was.
- LYXERR(Debug::LOCALE, "restoring LANGUAGE from " << getEnv("LANGUAGE")
- << " to " << main_lang_);
- if (!setEnv("LANGUAGE", main_lang_))
+ LYXERR(Debug::LOCALE, "restoring LANGUAGE from "
+ << getEnv("LANGUAGE")
+ << " to " << oldLANGUAGE);
+ if (!setEnv("LANGUAGE", oldLANGUAGE))
LYXERR(Debug::LOCALE, "\t... failed!");
LYXERR(Debug::LOCALE, "restoring LC_ALL from " << getEnv("LC_ALL")
<< " to " << oldLC_ALL);
namespace lyx {
-Messages::Messages(string const & l) {}
+Messages::Messages(string const & /* l */) {}
void Messages::init()
{
return trans;
}
+
+bool Messages::available() const
+{
+ return false;
+}
+
} // namespace lyx
#endif