really reset the LANGUAGE variable to its old value, instead of some other guessed...

[lyx.git] / src / support / Messages.cpp

diff --git a/src/support/Messages.cpp b/src/support/Messages.cpp
index 5d2a554d83917cc0ae1b8a226e28d98e9acc2fc2..b578c53dc53131ab4d5ce3e5b2e7901d896b3d57 100644 (file)
--- a/src/support/Messages.cpp
+++ b/src/support/Messages.cpp
@@ -2,7 +2,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -17,16 +17,18 @@
 #include "support/Package.h"
 #include "support/unicode.h"
 
-#include <boost/assert.hpp>
+#include "support/lassert.h"
 
 #include <cerrno>
 
 using namespace std;
 
-namespace {
+namespace lyx {
+
+// Instanciate static member.
+string Messages::main_lang_;
 
-using lyx::docstring;
-using lyx::from_ascii;
+namespace {
 
 void cleanTranslation(docstring & trans) 
 {
@@ -48,7 +50,8 @@ void cleanTranslation(docstring & trans)
        }
 }
 
-}
+} // anonymous
+} // lyx
 
 
 #ifdef ENABLE_NLS
@@ -60,13 +63,29 @@ void cleanTranslation(docstring & trans)
 #  if HAVE_GETTEXT
 #    include <libintl.h>      // use the header already in the system *EK*
 #  else
-#    include "../intl/libintl.h"
+#    include "../../intl/libintl.h"
 #  endif
 
 using namespace lyx::support;
 
 namespace lyx {
 
+void Messages::setDefaultLanguage()
+{
+       char const * env_lang[5] = {"LANGUAGE", "LC_ALL", "LC_MESSAGES",
+               "LC_MESSAGE", "LANG"};
+       for (size_t i = 0; i != 5; ++i) {
+               string const lang = getEnv(env_lang[i]);
+               if (lang.empty())
+                       continue;
+               Messages::main_lang_ = lang;
+               return;
+       }
+       // Not found!
+       LYXERR(Debug::LOCALE, "Default language not found!");
+}
+
+
 // This version use the traditional gettext.
 Messages::Messages(string const & l)
        : lang_(l), warned_(false)
@@ -74,7 +93,7 @@ Messages::Messages(string const & l)
        // strip off any encoding suffix, i.e., assume 8-bit po files
        size_t i = lang_.find(".");
        lang_ = lang_.substr(0, i);
-       LYXERR(Debug::DEBUG, "language(" << lang_ << ")");
+       LYXERR(Debug::LOCALE, "language(" << lang_ << ")");
 }
 
 
@@ -85,17 +104,20 @@ void Messages::init()
        char const * c = bindtextdomain(PACKAGE, locale_dir.c_str());
        int e = errno;
        if (e) {
-               LYXERR(Debug::DEBUG, "Error code: " << errno << '\n'
+               LYXERR(Debug::LOCALE, "Error code: " << errno << '\n'
                        << "Directory : " << package().locale_dir().absFilename() << '\n'
                        << "Rtn value : " << c);
        }
 
        if (!bind_textdomain_codeset(PACKAGE, ucs4_codeset)) {
-               LYXERR(Debug::DEBUG, "Error code: " << errno << '\n'
+               LYXERR(Debug::LOCALE, "Error code: " << errno << '\n'
                        << "Codeset   : " << ucs4_codeset);
        }
 
        textdomain(PACKAGE);
+
+       // Reset default language;
+       setDefaultLanguage();
 }
 
 
@@ -110,20 +132,25 @@ docstring const Messages::get(string const & m) const
                return it->second;
 
        // The string was not found, use gettext to generate it
-
-       string const oldLANGUAGE = getEnv("LANGUAGE");
-       string const oldLC_ALL = getEnv("LC_ALL");
+       static string oldLC_ALL;
+       static string oldLANGUAGE;
        if (!lang_.empty()) {
+               oldLC_ALL = getEnv("LC_ALL");
                // This GNU extension overrides any language locale
                // wrt gettext.
-               setEnv("LANGUAGE", lang_);
+               LYXERR(Debug::LOCALE, "Setting LANGUAGE to " << lang_);
+               oldLANGUAGE = getEnv("LANGUAGE");
+               if (!setEnv("LANGUAGE", lang_))
+                       LYXERR(Debug::LOCALE, "\t... failed!");
                // However, setting LANGUAGE does nothing when the
                // locale is "C". Therefore we set the locale to
                // something that is believed to exist on most
                // systems. The idea is that one should be able to
                // load German documents even without having de_DE
                // installed.
-               setEnv("LC_ALL", "en_US");
+               LYXERR(Debug::LOCALE, "Setting LC_ALL to en_US");
+               if (!setEnv("LC_ALL", "en_US"))
+                       LYXERR(Debug::LOCALE, "\t... failed!");
 #ifdef HAVE_LC_MESSAGES
                setlocale(LC_MESSAGES, "");
 #endif
@@ -133,12 +160,12 @@ docstring const Messages::get(string const & m) const
        char const * trans_c = gettext(m_c);
        docstring trans;
        if (!trans_c)
-               LYXERR0("Undefined result from gettext");
+               LYXERR(Debug::LOCALE, "Undefined result from gettext");
        else if (trans_c == m_c) {
-               LYXERR(Debug::DEBUG, "Same as entered returned");
+               //LYXERR(Debug::LOCALE, "Same as entered returned");
                trans = from_ascii(m);
        } else {
-               LYXERR(Debug::DEBUG, "We got a translation");
+               //LYXERR(Debug::LOCALE, "We got a translation");
                // m is actually not a char const * but ucs4 data
                trans = reinterpret_cast<char_type const *>(trans_c);
        }
@@ -148,8 +175,15 @@ docstring const Messages::get(string const & m) const
        // Reset environment variables as they were.
        if (!lang_.empty()) {
                // Reset everything as it was.
-               setEnv("LANGUAGE", oldLANGUAGE);
-               setEnv("LC_ALL", oldLC_ALL);
+               LYXERR(Debug::LOCALE, "restoring LANGUAGE from " 
+                      << getEnv("LANGUAGE")
+                      << " to " << oldLANGUAGE);
+               if (!setEnv("LANGUAGE", oldLANGUAGE))
+                       LYXERR(Debug::LOCALE, "\t... failed!");
+               LYXERR(Debug::LOCALE, "restoring LC_ALL from " << getEnv("LC_ALL")
+                       << " to " << oldLC_ALL);
+               if (!setEnv("LC_ALL", oldLC_ALL))
+                       LYXERR(Debug::LOCALE, "\t... failed!");
 #ifdef HAVE_LC_MESSAGES
                setlocale(LC_MESSAGES, "");
 #endif
@@ -158,7 +192,7 @@ docstring const Messages::get(string const & m) const
        pair<TranslationCache::iterator, bool> result =
                cache_.insert(make_pair(m, trans));
 
-       BOOST_ASSERT(result.second);
+       LASSERT(result.second, /**/);
 
        return result.first->second;
 }