Add GTK bibitem dialog

[lyx.git] / src / messages.C

diff --git a/src/messages.C b/src/messages.C
index 466d9e2240ca8376e19b3866886adcd6a2eff460..3baa83c3e451be4f77df6adc984b33d213e6f47a 100644 (file)
--- a/src/messages.C
+++ b/src/messages.C
@@ -4,36 +4,51 @@
  *
  * \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 "messages.h"
+#include "support/filetools.h"
+#include "support/environment.h"
+#include "support/package.h"
+
+#include <boost/current_function.hpp>
+#include <boost/regex.hpp>
+
+#include <cerrno>
+
+using lyx::support::package;
+using lyx::support::getEnv;
+using lyx::support::setEnv;
+
+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, package().locale_dir().c_str());
 
        }
 
@@ -50,8 +65,6 @@ private:
        ///
        string lang_;
        ///
-       string localedir_;
-       ///
        std::locale loc_gl;
        ///
        std::messages<char> const & mssg_gl;
@@ -73,34 +86,84 @@ private:
 // 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);
+               if ( lang_.empty() ) {
+                       char const * lc_msgs = setlocale(LC_MESSAGES, NULL);
+                       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;
        }
 
        ~Pimpl() {}
 
        string const get(string const & m) const
        {
-               char * old = strdup(setlocale(LC_ALL, 0));
-               char * n = setlocale(LC_ALL, lang_.c_str());
+               if (m.empty())
+                       return m;
+
+               //string oldMSG = setlocale(LC_MESSAGES, NULL);
+               // 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";
+                       }
+               }
+               
+               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
+               // 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 << std::endl;
+               }
+               textdomain(PACKAGE);
                const char* msg = gettext(m.c_str());
-               setlocale(LC_ALL, old);
-               free(old);
+               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.
-               return (!n ? m : string(msg));
+               static boost::regex const reg("^([^\\[]*)\\[\\[[^\\]]*\\]\\]$");
+               boost::smatch sub;
+               if (regex_match(translated, sub, reg))
+                       translated = sub.str(1);
+               setlocale(LC_MESSAGES, lang.c_str());
+               setlocale(LC_CTYPE, oldCTYPE.c_str());
+               return translated;
        }
 private:
        ///
        string lang_;
-       ///
-       string localedir_;
 };
 #endif
 
@@ -108,7 +171,7 @@ private:
 // This is the dummy variant.
 class Messages::Pimpl {
 public:
-       Pimpl(string const &, string const &) {}
+       Pimpl(string const &) {}
 
        ~Pimpl() {}
 
@@ -119,8 +182,14 @@ public:
 };
 #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))
 {}