X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmessages.C;h=90a345470cbaaac57c0cb2aa09bbb14cdfa914c7;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=44c029b5d21185c6e738f5d61efb09edb24d8372;hpb=6b6f2569448be8629b8b2541a6e3fa47879abacf;p=lyx.git diff --git a/src/messages.C b/src/messages.C index 44c029b5d2..90a345470c 100644 --- a/src/messages.C +++ b/src/messages.C @@ -4,36 +4,60 @@ * * \author Lars Gullik Bjønnes * - * Full author contact details are available in file CREDITS + * Full author contact details are available in file CREDITS. */ #include -#include "messages.h" #include "debug.h" +#include "messages.h" +#include "support/filetools.h" +#include "support/environment.h" +#include "support/package.h" +#include "support/docstring.h" +#include "support/types.h" + +#include +#include + +#include + + +namespace lyx { + +using support::package; +using support::getEnv; +using support::setEnv; + +using std::string; +using std::endl; + + +static boost::regex const reg("^([^\\[]*)\\[\\[[^\\]]*\\]\\]$"); #ifdef ENABLE_NLS + #if 0 -#include +-#include // This version of the Pimpl utilizes the message capability of -// libstdc++ that is distributed with GNU G++ +// libstdc++ that is distributed with GNU G++. class Messages::Pimpl { public: typedef std::messages::catalog catalog; - Pimpl(string const & l, string const & dir) - : lang_(l), localedir_(dir), + Pimpl(string const & l) + : lang_(l), loc_gl(lang_.c_str()), 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, localedir_.c_str()); + cat_gl = mssg_gl.open(PACKAGE, loc_gl, package().locale_dir().c_str()); } @@ -42,7 +66,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); } @@ -50,8 +74,6 @@ private: /// string lang_; /// - string localedir_; - /// std::locale loc_gl; /// std::messages const & mssg_gl; @@ -73,32 +95,122 @@ private: // This is a more traditional variant. class Messages::Pimpl { public: - Pimpl(string const & l, string const & dir) - : lang_(l), localedir_(dir) + Pimpl(string const & l) + : lang_(l) { - //lyxerr << "Messages: language(" << l - // << ") in dir(" << dir << ")" << std::endl; - - bindtextdomain(PACKAGE, localedir_.c_str()); - textdomain(PACKAGE); + 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; } ~Pimpl() {} - string const get(string const & m) const + docstring const get(string const & m) const { - char * old = strdup(setlocale(LC_ALL, 0)); - setlocale(LC_ALL, lang_.c_str()); - const char* msg = gettext(m.c_str()); - setlocale(LC_ALL, old); - free(old); - return string(msg); + if (m.empty()) + return from_ascii(m); + + // 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__) + static 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; + } +#ifdef WORDS_BIGENDIAN + static const char * codeset = "UCS-4BE"; +#else + static const char * codeset = "UCS-4LE"; +#endif + if (!bind_textdomain_codeset(PACKAGE, codeset)) { + lyxerr[Debug::DEBUG] + << BOOST_CURRENT_FUNCTION << '\n' + << "Error code: " << errno << '\n' + << "Codeset : " << codeset << '\n' + << endl; + } + + 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()); + return translated; } private: /// string lang_; - /// - string localedir_; }; #endif @@ -106,19 +218,30 @@ private: // This is the dummy variant. class Messages::Pimpl { public: - Pimpl(string const &, string const &) {} + Pimpl(string const &) {} ~Pimpl() {} - string const get(string const & m) const + docstring const get(string const & m) const { - return m; + // See comment above + boost::smatch sub; + if (regex_match(m, sub, reg)) + return from_ascii(sub.str(1)); + else + return from_ascii(m); } }; #endif -Messages::Messages(string const & l, string const & dir) - : pimpl_(new Pimpl(l, dir)) + +Messages::Messages() + : pimpl_(new Pimpl("")) +{} + + +Messages::Messages(string const & l) + : pimpl_(new Pimpl(l)) {} @@ -127,7 +250,10 @@ Messages::~Messages() {} -string const Messages::get(string const & msg) const +docstring const Messages::get(string const & msg) const { return pimpl_->get(msg); } + + +} // namespace lyx