*
* \author Lars Gullik Bjønnes
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "messages.h"
-#include "debug.h"
+#include "support/filetools.h"
+#include "support/path_defines.h"
+
+#include <boost/regex.hpp>
+
+using lyx::support::lyx_localedir;
+
+using std::string;
#ifdef ENABLE_NLS
+
#if 0
-#include <locale>
+-#include <locale>
// 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<char>::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<std::messages<char> >(loc_gl))
{
//lyxerr << "Messages: language(" << l
// << ") in dir(" << dir << ")" << std::endl;
- cat_gl = mssg_gl.open(PACKAGE, loc_gl, localedir_.c_str());
+ cat_gl = mssg_gl.open(PACKAGE, loc_gl, lyx_localedir().c_str());
}
///
string lang_;
///
- string localedir_;
- ///
std::locale loc_gl;
///
std::messages<char> const & mssg_gl;
// 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);
}
~Pimpl() {}
string const get(string const & m) const
{
+ if (m.empty())
+ return m;
+
char * old = strdup(setlocale(LC_ALL, 0));
- setlocale(LC_ALL, lang_.c_str());
+ char * n = setlocale(LC_ALL, lang_.c_str());
+ bindtextdomain(PACKAGE, lyx_localedir().c_str());
+ textdomain(PACKAGE);
const char* msg = gettext(m.c_str());
+ // 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.
+ string translated(n ? msg : m);
+ static boost::regex const reg("^([^\\[]*)\\[\\[[^\\]]*\\]\\]$");
+ boost::smatch sub;
+ if (regex_match(translated, sub, reg))
+ translated = sub.str(1);
setlocale(LC_ALL, old);
free(old);
- return string(msg);
+ return translated;
}
private:
///
string lang_;
- ///
- string localedir_;
};
#endif
// This is the dummy variant.
class Messages::Pimpl {
public:
- Pimpl(string const &, string const &) {}
+ Pimpl(string const &) {}
~Pimpl() {}
};
#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))
{}