tiger support on mac snow leopard, include Qt4 frameworks, smart build script with...

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

diff --git a/src/support/Messages.cpp b/src/support/Messages.cpp
index 5a921953c2eaf709aa18b6f58322555826913b93..fc6ca0aaf051a3557d4adf4e7c276d9ff7a46063 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.
  */
@@ -23,10 +23,12 @@
 
 using namespace std;
 
-namespace {
+namespace lyx {
 
-using lyx::docstring;
-using lyx::from_ascii;
+// Instanciate static member.
+string Messages::main_lang_;
+
+namespace {
 
 void cleanTranslation(docstring & trans) 
 {
@@ -48,7 +50,8 @@ void cleanTranslation(docstring & trans)
        }
 }
 
-}
+} // anonymous
+} // lyx
 
 
 #ifdef ENABLE_NLS
@@ -67,6 +70,22 @@ 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)
@@ -96,6 +115,9 @@ void Messages::init()
        }
 
        textdomain(PACKAGE);
+
+       // Reset default language;
+       setDefaultLanguage();
 }
 
 
@@ -110,13 +132,14 @@ docstring const Messages::get(string const & m) const
                return it->second;
 
        // The string was not found, use gettext to generate it
-
-       static string const oldLANGUAGE = getEnv("LANGUAGE");
-       static 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.
                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
@@ -136,10 +159,11 @@ docstring const Messages::get(string const & m) const
        char const * m_c = m.c_str();
        char const * trans_c = gettext(m_c);
        docstring trans;
-       if (!trans_c)
-               LYXERR(Debug::LOCALE, "Undefined result from gettext");
-       else if (trans_c == m_c) {
-               LYXERR(Debug::LOCALE, "Same as entered returned");
+       if (!trans_c) {
+               LYXERR(Debug::LOCALE, "Undefined result from gettext for `" << m << "'.");
+               trans = from_ascii(m);
+       } else if (trans_c == m_c) {
+               //LYXERR(Debug::LOCALE, "Same as entered returned");
                trans = from_ascii(m);
        } else {
                //LYXERR(Debug::LOCALE, "We got a translation");
@@ -152,8 +176,9 @@ 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 " << oldLANGUAGE);
+               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")