#include "support/filetools.h"
#include "support/environment.h"
#include "support/package.h"
+#include "support/docstring.h"
+#include "support/types.h"
#include <boost/current_function.hpp>
#include <boost/regex.hpp>
#include <cerrno>
-using lyx::support::package;
-using lyx::support::getEnv;
-using lyx::support::setEnv;
+
+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
mssg_gl(std::use_facet<std::messages<char> >(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());
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);
}
: lang_(l)
{
if ( lang_.empty() ) {
- char const * lc_msgs = setlocale(LC_MESSAGES, NULL);
+ 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()) {
lang = "C";
}
}
-
+#ifdef HAVE_LC_MESSAGES
char const * lc_msgs = setlocale(LC_MESSAGES, lang_.c_str());
-#ifndef _WIN32
- if (!lc_msgs)
- lyxerr << "Locale " << lang_ << " could not be set" << std::endl;
+#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);
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(msg ? 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<char_type const *>(msg);
+ translated = ucs4;
+ }
+#ifdef HAVE_LC_MESSAGES
setlocale(LC_MESSAGES, lang.c_str());
+#endif
setlocale(LC_CTYPE, oldCTYPE.c_str());
return translated;
}
~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
{}
-string const Messages::get(string const & msg) const
+docstring const Messages::get(string const & msg) const
{
return pimpl_->get(msg);
}
+
+
+} // namespace lyx
projects / lyx.git / blobdiff