X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmessages.C;h=bb83e90dfc143fd87c4ccad1e0b7e54135b8fd3e;hb=c727c6db7f2dd7f6a727462f5d11964888d0e76e;hp=13098b87301d059f0d977b63d693b051a848f873;hpb=d0515ddc43f141ca8df3b26d935d49b791a612c8;p=lyx.git diff --git a/src/messages.C b/src/messages.C index 13098b8730..bb83e90dfc 100644 --- a/src/messages.C +++ b/src/messages.C @@ -9,21 +9,40 @@ #include -#include "debug.h" #include "messages.h" -#include "support/filetools.h" + +#include "debug.h" + +#include "support/docstring.h" #include "support/environment.h" +#include "support/filetools.h" #include "support/package.h" -#include "support/docstring.h" #include "support/types.h" #include #include #include -#include + +namespace { +boost::regex const reg("^([^\\[]*)\\[\\[[^\\]]*\\]\\]$"); +}; + +#ifdef ENABLE_NLS + +#ifdef HAVE_LOCALE_H +# include +#endif + +# 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 { @@ -33,16 +52,169 @@ using support::getEnv; using support::setEnv; -static boost::regex const reg("^([^\\[]*)\\[\\[[^\\]]*\\]\\]$"); +#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) +{ + 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; +} -#ifdef ENABLE_NLS +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; + } + + 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); +} + +} // namespace lyx + +#endif #if 0 -#include +namespace lyx { + // This version of the Pimpl utilizes the message capability of // libstdc++ that is distributed with GNU G++. class Messages::Pimpl { @@ -80,194 +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) - { - 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() {} - - docstring const & get(string const & m) const - { - static docstring empty_string; - if (m.empty()) - return empty_string; - - // Look for the translated string in the cache. - CacheType::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__) - 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()); - - it = cache_.insert(std::make_pair(m, translated)).first; - return it->second; - } -private: - /// - string lang_; - typedef std::map CacheType; - /// Internal cache for gettext translated strings. - /// This is needed for performance reason within \c updateLabels() - /// under Windows. - mutable CacheType cache_; -}; -#endif -#else // ENABLE_NLS -// This is the dummy variant. -class Messages::Pimpl { -public: - Pimpl(string const &) {} - - ~Pimpl() {} +} // namespace lyx - docstring const 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); - } -}; #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() -{} - - -docstring const & Messages::get(string const & msg) const -{ - return pimpl_->get(msg); -} - - -} // namespace lyx