unneeded header

[lyx.git] / src / client / messages.C

diff --git a/src/client/messages.C b/src/client/messages.C
index d1aa3f52217c77a1bf95f0b17ca5c69bf9dd223e..0f140dcdba65685a298b5d8a6ba09c1419e81e42 100644 (file)
--- a/src/client/messages.C
+++ b/src/client/messages.C
@@ -10,12 +10,19 @@
 #include <config.h>
 
 #include "messages.h"
+#include "debug.h"
 #include "support/filetools.h"
-#include "support/path_defines.h"
+#include "support/package.h"
 
-using lyx::support::GetEnvPath;
-using lyx::support::lyx_localedir;
+#include <boost/current_function.hpp>
 
+#include <cerrno>
+
+
+namespace lyx {
+
+using lyx::support::package;
+using std::endl;
 using std::string;
 
 
@@ -40,7 +47,8 @@ public:
                //lyxerr << "Messages: language(" << l
                //       << ") in dir(" << dir << ")" << std::endl;
 
-               cat_gl = mssg_gl.open(PACKAGE, loc_gl, lyx_localedir().c_str());
+               cat_gl = mssg_gl.open(PACKAGE, loc_gl,
+                                     package().locale_dir().c_str());
 
        }
 
@@ -88,21 +96,63 @@ public:
 
        ~Pimpl() {}
 
-       string const get(string const & m) const
+       docstring const get(string const & m) const
        {
                if (m.empty())
-                       return m;
+                       return from_ascii(m);
 
-               char * old = strdup(setlocale(LC_ALL, 0));
+               char * o = setlocale(LC_ALL, 0);
+               string old;
+               if (o)
+                       old = o;
                char * n = setlocale(LC_ALL, lang_.c_str());
-               bindtextdomain(PACKAGE, lyx_localedir().c_str());
+               if (!n)
+                       // If we are unable to honour the request we just
+                       // return what we got in.
+                       return from_ascii(m);
+               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);
-               const char* msg = gettext(m.c_str());
-               setlocale(LC_ALL, old);
-               free(old);
-               // If we are unable to honour the request we just
-               // return what we got in.
-               return (!n ? m : string(msg));
+
+               char const * tmp = m.c_str();
+               char const * msg = gettext(tmp);
+               docstring translated;
+               if (!msg) {
+                       lyxerr << "Undefined result from gettext" << endl;
+                       translated = from_ascii(tmp);
+               } else if (msg == tmp) {
+                       //lyxerr << "Same as entered returned" << endl;
+                       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;
+               }
+               setlocale(LC_ALL, old.c_str());
+               return translated;
        }
 private:
        ///
@@ -118,9 +168,9 @@ public:
 
        ~Pimpl() {}
 
-       string const get(string const & m) const
+       docstring const get(string const & m) const
        {
-               return m;
+               return from_ascii(m);
        }
 };
 #endif
@@ -141,7 +191,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