Some english words have different translations, depending on
context. In these cases the original string is augmented by
context information (e.g. "To:[[as in 'From page x to page
- y']]" and "To:[[as in 'From format x to format y']]". This
- means that we need to filter out everything in double square
- brackets at the end of the string, otherwise the user sees
- bogus messages. If we are unable to honour the request we
- just return what we got in.
+ y']]" and "To:[[as in 'From format x to format y']]". Also,
+ when placeholders are used, the context can indicate what will
+ be substituted for the placeholder (e.g. "%1$s[[date]], %1$s
+ [[time]]). This means that we need to filter out everything
+ in double square brackets at the end of the string, otherwise
+ the user sees bogus messages. If we are unable to honour the
+ request we just return what we got in.
*/
- size_t const pos1 = trans.find(from_ascii("[["));
- if (pos1 != docstring::npos) {
- size_t const pos2 = trans.find(from_ascii("]]"), pos1);
- if (pos2 != docstring::npos)
- trans.erase(pos1, pos2 - pos1 + 2);
+ static docstring const ctx_start = from_ascii("[[");
+ static docstring const ctx_end = from_ascii("]]");
+ while (true) {
+ size_t const pos1 = trans.find(ctx_start);
+ if (pos1 != docstring::npos) {
+ size_t const pos2 = trans.find(ctx_end, pos1);
+ if (pos2 != docstring::npos) {
+ trans.erase(pos1, pos2 - pos1 + 2);
+ continue;
+ }
+ }
+ break;
}
}
// This version use the traditional gettext.
Messages::Messages(string const & l)
- : lang_(l), warned_(false)
+ : lang_(l)
{
// strip off any encoding suffix, i.e., assume 8-bit po files
size_t i = lang_.find(".");
}
-bool Messages::available() const
+bool Messages::available(string const & c)
{
- return !language().empty();
+ static string locale_dir = package().locale_dir().toFilesystemEncoding();
+ string code = c;
+ // this loops at most twice
+ while (true) {
+ string const filen = locale_dir + "/" + code
+ + "/LC_MESSAGES/" PACKAGE ".mo";
+ if (FileName(filen).isReadableFile())
+ return true;
+ if (contains(code, '_'))
+ code = token(code, '_', 0);
+ else return false;
+ }
+ return false;
+
+}
+
+namespace {
+
+// Trivial wrapper around gettext()
+docstring const getText(string const & m)
+{
+ // 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!
+ LATTEST(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 for `" << m << "'.");
+ trans = from_ascii(m);
+ } else if (trans_c == m_c) {
+ //LYXERR(Debug::LOCALE, "Same as entered returned");
+ trans = from_ascii(m);
+ } else {
+ //LYXERR(Debug::LOCALE, "We got a translation");
+ // m is actually not a char const * but ucs4 data
+ trans = reinterpret_cast<char_type const *>(trans_c);
+ }
+
+ cleanTranslation(trans);
+
+ return trans;
+}
+
}
return it->second;
// The string was not found, use gettext to generate it
- static string oldLC_ALL;
- static string oldLANGUAGE;
+ docstring trans;
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!");
+ EnvChanger language_chg("LANGUAGE", lang_);
// However, setting LANGUAGE does nothing when the
// locale is "C". Therefore we set the locale to
// something that is believed to exist on most
// load German documents even without having de_DE
// installed.
LYXERR(Debug::LOCALE, "Setting LC_ALL to en_US");
- if (!setEnv("LC_ALL", "en_US"))
- LYXERR(Debug::LOCALE, "\t... failed!");
+ EnvChanger lc_all_chg("LC_ALL", "en_US");
#ifdef HAVE_LC_MESSAGES
setlocale(LC_MESSAGES, "");
#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 for `" << m << "'.");
- trans = from_ascii(m);
- } else if (trans_c == m_c) {
- //LYXERR(Debug::LOCALE, "Same as entered returned");
- trans = from_ascii(m);
- } else {
- //LYXERR(Debug::LOCALE, "We got a translation");
- // m is actually not a char const * but ucs4 data
- trans = reinterpret_cast<char_type const *>(trans_c);
- }
-
- cleanTranslation(trans);
+ trans = getText(m);
+ } else
+ trans = getText(m);
+
- // Reset environment variables as they were.
- if (!lang_.empty()) {
- // Reset everything as it was.
- 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);
- if (!setEnv("LC_ALL", oldLC_ALL))
- LYXERR(Debug::LOCALE, "\t... failed!");
#ifdef HAVE_LC_MESSAGES
- setlocale(LC_MESSAGES, "");
+ setlocale(LC_MESSAGES, "");
#endif
- }
+ // store translation in cache
pair<TranslationCache::iterator, bool> result =
cache_.insert(make_pair(m, trans));
- LASSERT(result.second, /**/);
+ LASSERT(result.second, return from_utf8(m));
return result.first->second;
}
return trans;
}
+std::string Messages::language() const
+ {
+ return string();
+ }
-bool Messages::available() const
+bool Messages::available(string const & /* c */)
{
return false;
}
} // namespace lyx
#endif
-
-#if 0
-
--#include <locale>
-
-namespace lyx {
-
-// This version of the Pimpl utilizes the message capability of
-// libstdc++ that is distributed with GNU G++.
-class Messages::Pimpl {
-public:
- typedef messages<char>::catalog catalog;
-
- Pimpl(string const & l)
- : lang_(l),
- loc_gl(lang_.c_str()),
- mssg_gl(use_facet<messages<char> >(loc_gl))
- {
- //LYXERR("Messages: language(" << l << ") in dir(" << dir << ")");
-
- string const locale_dir = package().locale_dir().toFilesystemEncoding();
- cat_gl = mssg_gl.open(PACKAGE, loc_gl, locale_dir.c_str());
-
- }
-
- ~Pimpl()
- {
- mssg_gl.close(cat_gl);
- }
-
- docstring const get(string const & msg) const
- {
- return mssg_gl.get(cat_gl, 0, 0, msg);
- }
-private:
- ///
- string lang_;
- ///
- locale loc_gl;
- ///
- messages<char> const & mssg_gl;
- ///
- catalog cat_gl;
-};
-
-} // namespace lyx
-
-#endif
projects / lyx.git / blobdiff