X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmessages.C;h=90a345470cbaaac57c0cb2aa09bbb14cdfa914c7;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=fbab556bcb1bb7cee401e5f2d8bf1663fd99089c;hpb=df04880e55cc07568271f638728700412058e827;p=lyx.git

diff --git a/src/messages.C b/src/messages.C
index fbab556bcb..90a345470c 100644
--- a/src/messages.C
+++ b/src/messages.C
@@ -14,17 +14,26 @@
 #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
@@ -46,7 +55,7 @@ public:
 		  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());
 
@@ -57,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);
 	}
@@ -100,15 +109,15 @@ public:
 		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);
 
 		// In this order, see support/filetools.C:
 		string lang = getEnv("LC_ALL");
@@ -125,14 +134,14 @@ public:
 #endif
 		// setlocale fails (returns NULL) if the corresponding locale
 		// is not installed.
-		// On windows (mingw) it always returns NULL.
+		// 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.
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(__CYGWIN__)
 		static bool warned = false;
 		if (!warned && !lc_msgs) {
 			warned = true;
-			lyxerr << "Locale " << lang_ << " could not be set" << std::endl;
+			lyxerr << "Locale " << lang_ << " could not be set" << endl;
 		}
 #endif
 		// CTYPE controls what getmessage thinks what encoding the po file uses
@@ -149,25 +158,50 @@ public:
 				<< "Error code: " << errno << '\n'
 				<< "Lang, mess: " << lang_ << " " << m << '\n'
 				<< "Directory : " << package().locale_dir() << '\n'
-				<< "Rtn value : " << c << std::endl;
+				<< "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
@@ -188,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
@@ -211,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