From 9c0b6cf700e2052a2803b16090f8afa0b76df367 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Mon, 9 Mar 2009 13:49:53 +0000 Subject: [PATCH] really reset the LANGUAGE variable to its old value, instead of some other guessed value git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28737 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/support/Messages.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/support/Messages.cpp b/src/support/Messages.cpp index c98f865aec..b578c53dc5 100644 --- a/src/support/Messages.cpp +++ b/src/support/Messages.cpp @@ -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); -- 2.39.2