X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmessages.C;h=bb83e90dfc143fd87c4ccad1e0b7e54135b8fd3e;hb=c727c6db7f2dd7f6a727462f5d11964888d0e76e;hp=a933fbacdc55e6fd95f07fa3d00662ede5c6d719;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git diff --git a/src/messages.C b/src/messages.C index a933fbacdc..bb83e90dfc 100644 --- a/src/messages.C +++ b/src/messages.C @@ -10,34 +10,210 @@ #include #include "messages.h" + #include "debug.h" + +#include "support/docstring.h" +#include "support/environment.h" #include "support/filetools.h" -#include "support/path_defines.h" +#include "support/package.h" +#include "support/types.h" -using namespace lyx::support; +#include +#include +#include + +namespace { +boost::regex const reg("^([^\\[]*)\\[\\[[^\\]]*\\]\\]$"); +}; #ifdef ENABLE_NLS -namespace { +#ifdef HAVE_LOCALE_H +# include +#endif -string const & getLocaleDir() +# if HAVE_GETTEXT +# include // use the header already in the system *EK* +# else +# include "../intl/libintl.h" +# endif + +using std::endl; +using std::make_pair; +using std::map; +using std::string; + +namespace lyx { + +using support::package; +using support::getEnv; +using support::setEnv; + + +#ifdef WORDS_BIGENDIAN + char const * codeset = "UCS-4BE"; +#else + char const * codeset = "UCS-4LE"; +#endif + +// This version use the traditional gettext. +Messages::Messages(string const & l) + : lang_(l) { - static string locale_dir; + if ( lang_.empty() ) { + char const * lc_msgs = 0; +#ifdef HAVE_LC_MESSAGES + lc_msgs = setlocale(LC_MESSAGES, NULL); +#endif + lang_ = lc_msgs ? lc_msgs : ""; + } + // strip off any encoding suffix, i.e., assume 8-bit po files + string::size_type i = lang_.find("."); + lang_ = lang_.substr(0, i); + lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION + << ": language(" << lang_ << ")" << endl; +} + - if (locale_dir.empty()) { - locale_dir = GetEnvPath("LYX_LOCALEDIR"); - if (locale_dir.empty()) - locale_dir = lyx_localedir(); +docstring const Messages::get(string const & m) const +{ + if (m.empty()) + return docstring(); + + // Look for the translated string in the cache. + TranslationCache::iterator it = cache_.find(m); + if (it != cache_.end()) + return it->second; + // The string was not found, use gettext to generate it: + + // In this order, see support/filetools.C: + string lang = getEnv("LC_ALL"); + if (lang.empty()) { + lang = getEnv("LC_MESSAGES"); + if (lang.empty()) { + lang = getEnv("LANG"); + if (lang.empty()) + lang = "C"; + } + } +#ifdef HAVE_LC_MESSAGES + char const * lc_msgs = setlocale(LC_MESSAGES, lang_.c_str()); +#endif + // setlocale fails (returns NULL) if the corresponding locale + // is not installed. + // On windows (mingw and cygwin) it always returns NULL. + // Since this method gets called for every translatable + // buffer string like e.g. "Figure:" we warn only once. +#if !defined(_WIN32) && !defined(__CYGWIN__) + bool warned = false; + if (!warned && !lc_msgs) { + warned = true; + lyxerr << "Locale " << lang_ << " could not be set" << endl; + } +#endif + // CTYPE controls what getmessage thinks what encoding the po file uses + char const * lc_ctype = setlocale(LC_CTYPE, NULL); + string oldCTYPE = lc_ctype ? lc_ctype : ""; + + setlocale(LC_CTYPE, lang_.c_str()); + errno = 0; + char const * c = bindtextdomain(PACKAGE, package().locale_dir().c_str()); + int e = errno; + if (e) { + lyxerr[Debug::DEBUG] + << BOOST_CURRENT_FUNCTION << '\n' + << "Error code: " << errno << '\n' + << "Lang, mess: " << lang_ << " " << m << '\n' + << "Directory : " << package().locale_dir() << '\n' + << "Rtn value : " << c << endl; + } + + if (!bind_textdomain_codeset(PACKAGE, codeset)) { + lyxerr[Debug::DEBUG] + << BOOST_CURRENT_FUNCTION << '\n' + << "Error code: " << errno << '\n' + << "Codeset : " << codeset << '\n' + << endl; } - return locale_dir; + + textdomain(PACKAGE); + char const * tmp = m.c_str(); + char const * msg = gettext(tmp); + docstring translated; + if (!msg || msg == tmp) { + if (!msg) + lyxerr << "Undefined result from gettext" << endl; + //else + // lyxerr << "Same as entered returned" << endl; + // 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. + boost::smatch sub; + if (regex_match(m, sub, reg)) + translated = from_ascii(sub.str(1)); + else + translated = from_ascii(tmp); + } else { + lyxerr[Debug::DEBUG] << "We got a translation" << endl; + char_type const * ucs4 = reinterpret_cast(msg); + translated = ucs4; + } +#ifdef HAVE_LC_MESSAGES + setlocale(LC_MESSAGES, lang.c_str()); +#endif + setlocale(LC_CTYPE, oldCTYPE.c_str()); + + std::pair result = + cache_.insert(std::make_pair(m, translated)); + + BOOST_ASSERT(result.second); + + return result.first->second; +} + +} // namespace lyx + +#else // ENABLE_NLS +// This is the dummy variant. + +using std::endl; +using std::make_pair; +using std::map; +using std::string; + +namespace lyx { + +Messages::Messages(string const & l) {} + + +docstring const Messages::get(string const & m) const +{ + // See comment above + boost::smatch sub; + if (regex_match(m, sub, reg)) + return from_ascii(sub.str(1)); + else + return from_ascii(m); } -} // anon namespace +} // namespace lyx + +#endif #if 0 -#include +-#include + +namespace lyx { // This version of the Pimpl utilizes the message capability of // libstdc++ that is distributed with GNU G++. @@ -51,9 +227,9 @@ public: mssg_gl(std::use_facet >(loc_gl)) { //lyxerr << "Messages: language(" << l - // << ") in dir(" << dir << ")" << std::endl; + // << ") in dir(" << dir << ")" << endl; - cat_gl = mssg_gl.open(PACKAGE, loc_gl, getLocaleDir().c_str()); + cat_gl = mssg_gl.open(PACKAGE, loc_gl, package().locale_dir().c_str()); } @@ -62,7 +238,7 @@ public: mssg_gl.close(cat_gl); } - string const get(string const & msg) const + docstring const get(string const & msg) const { return mssg_gl.get(cat_gl, 0, 0, msg); } @@ -76,85 +252,7 @@ private: /// catalog cat_gl; }; -#else - -#ifdef HAVE_LOCALE_H -# include -#endif - -# if HAVE_GETTEXT -# include // use the header already in the system *EK* -# else -# include "../intl/libintl.h" -# endif - -// This is a more traditional variant. -class Messages::Pimpl { -public: - Pimpl(string const & l) - : lang_(l) - { - //lyxerr << "Messages: language(" << l - // << ") in dir(" << dir << ")" << std::endl; - - bindtextdomain(PACKAGE, getLocaleDir().c_str()); - textdomain(PACKAGE); - } - - ~Pimpl() {} - - string const get(string const & m) const - { - if (m.empty()) - return m; - - char * old = strdup(setlocale(LC_ALL, 0)); - char * n = setlocale(LC_ALL, lang_.c_str()); - const char* msg = gettext(m.c_str()); - setlocale(LC_ALL, old); - free(old); - // If we are unable to honour the request we just - // return what we got in. - return (!n ? m : string(msg)); - } -private: - /// - string lang_; -}; -#endif -#else // ENABLE_NLS -// This is the dummy variant. -class Messages::Pimpl { -public: - Pimpl(string const &) {} - - ~Pimpl() {} +} // namespace lyx - string const get(string const & m) const - { - return m; - } -}; #endif - - -Messages::Messages() - : pimpl_(new Pimpl("")) -{} - - -Messages::Messages(string const & l) - : pimpl_(new Pimpl(l)) -{} - - -// We need this for the sake of scoped_ptr -Messages::~Messages() -{} - - -string const Messages::get(string const & msg) const -{ - return pimpl_->get(msg); -}