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 096485335f69e002a2618b230702aaf2ae2dcde3..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.
  */
@@ -133,11 +133,13 @@ docstring const Messages::get(string const & m) const
 
        // The string was not found, use gettext to generate it
        static string oldLC_ALL;
+       static string oldLANGUAGE;
        if (!lang_.empty()) {
                oldLC_ALL = getEnv("LC_ALL");
                // This GNU extension overrides any language locale
                // wrt gettext.
                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
@@ -173,9 +175,10 @@ docstring const Messages::get(string const & m) const
        // Reset environment variables as they were.
        if (!lang_.empty()) {
                // Reset everything as it was.
-               LYXERR(Debug::LOCALE, "restoring LANGUAGE from " << getEnv("LANGUAGE")
-                       << " to " << main_lang_);
-               if (!setEnv("LANGUAGE", main_lang_))
+               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);