X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmessages.C;h=90a345470cbaaac57c0cb2aa09bbb14cdfa914c7;hb=946ede62d061aa06c65c16d32d97044090f8e45b;hp=2dc08968c88ac3b7d76e40f641dc981a540ea72c;hpb=a798566541ec648e54a06ed4b5d3e78faf5b2323;p=lyx.git diff --git a/src/messages.C b/src/messages.C index 2dc08968c8..90a345470c 100644 --- a/src/messages.C +++ b/src/messages.C @@ -14,14 +14,26 @@ #include "support/filetools.h" #include "support/environment.h" #include "support/package.h" +#include "support/docstring.h" +#include "support/types.h" +#include #include -using lyx::support::package; -using lyx::support::getEnv; -using lyx::support::setEnv; +#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 @@ -43,7 +55,7 @@ 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, package().locale_dir().c_str()); @@ -54,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); } @@ -86,23 +98,27 @@ public: Pimpl(string const & l) : lang_(l) { - if ( lang_.empty() ) - lang_ = setlocale(LC_MESSAGES, NULL); + 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_ << ")" << std::endl; + << ": language(" << lang_ << ")" << endl; } ~Pimpl() {} - string const get(string const & m) const + docstring const get(string const & m) const { if (m.empty()) - return m; + return from_ascii(m); - //string oldMSG = setlocale(LC_MESSAGES, NULL); // In this order, see support/filetools.C: string lang = getEnv("LC_ALL"); if (lang.empty()) { @@ -113,42 +129,82 @@ public: lang = "C"; } } - - char const * works = setlocale(LC_MESSAGES, lang_.c_str()); - if (!works) - lyxerr << "Locale " << lang_ << " could not be set" << std::endl; +#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 - string oldCTYPE = setlocale(LC_CTYPE, NULL); + 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 << std::endl; + << 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); - const char* msg = gettext(m.c_str()); - string translated(works ? msg : m); - // 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. - static boost::regex const reg("^([^\\[]*)\\[\\[[^\\]]*\\]\\]$"); - boost::smatch sub; - if (regex_match(translated, sub, reg)) - translated = sub.str(1); + 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; } @@ -166,9 +222,14 @@ public: ~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 @@ -189,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