do not define boost::throw_exceptions if we are compiling with exceptions

[lyx.git] / src / messages.C

diff --git a/src/messages.C b/src/messages.C
index 2dc56ae049e016131a7d5e00bb14e24e9a82aaeb..989bb9a0d0c5b84bd0b48d0948d2105cbe455be9 100644 (file)
--- a/src/messages.C
+++ b/src/messages.C
@@ -9,30 +9,26 @@
 
 #include <config.h>
 
+#include "debug.h"
 #include "messages.h"
 #include "support/filetools.h"
-#include "support/path_defines.h"
+#include "support/environment.h"
+#include "support/package.h"
 
-using namespace lyx::support;
+#include <boost/current_function.hpp>
+#include <boost/regex.hpp>
 
+#include <cerrno>
 
-#ifdef ENABLE_NLS
+using lyx::support::package;
+using lyx::support::getEnv;
+using lyx::support::setEnv;
 
-namespace {
+using std::string;
 
-string const & getLocaleDir()
-{
-       static string locale_dir;
 
-       if (locale_dir.empty()) {
-               locale_dir = GetEnvPath("LYX_LOCALEDIR");
-               if (locale_dir.empty())
-                       locale_dir = lyx_localedir();
-       }
-       return locale_dir;
-}
+#ifdef ENABLE_NLS
 
-} // anon namespace
 
 #if 0
 
@@ -52,7 +48,7 @@ public:
                //lyxerr << "Messages: language(" << l
                //       << ") in dir(" << dir << ")" << std::endl;
 
-               cat_gl = mssg_gl.open(PACKAGE, loc_gl, getLocaleDir().c_str());
+               cat_gl = mssg_gl.open(PACKAGE, loc_gl, package().locale_dir().c_str());
 
        }
 
@@ -93,11 +89,15 @@ public:
        Pimpl(string const & l)
                : lang_(l)
        {
-               //lyxerr << "Messages: language(" << l
-               //       << ") in dir(" << dir << ")" << std::endl;
-
-             bindtextdomain(PACKAGE, getLocaleDir().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() {}
@@ -107,14 +107,66 @@ public:
                if (m.empty())
                        return m;
 
-               char * old = strdup(setlocale(LC_ALL, 0));
-               char * n = setlocale(LC_ALL, lang_.c_str());
+               // 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());
+               // setlocale fails (returns NULL) if the corresponding locale
+               // is not installed.
+               // On windows (mingw) it always returns NULL.
+               // Since this method gets called for every translatable
+               // buffer string like e.g. "Figure:" we warn only once.
+#ifndef _WIN32
+               static bool warned = false;
+               if (!warned && !lc_msgs) {
+                       warned = true;
+                       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:
        ///