minimal effort implementation of:

[lyx.git] / src / messages.C

diff --git a/src/messages.C b/src/messages.C
index 3baa83c3e451be4f77df6adc984b33d213e6f47a..fbab556bcb1bb7cee401e5f2d8bf1663fd99089c 100644 (file)
--- a/src/messages.C
+++ b/src/messages.C
@@ -90,14 +90,17 @@ public:
                : lang_(l)
        {
                if ( lang_.empty() ) {
-                       char const * lc_msgs = setlocale(LC_MESSAGES, NULL);
+                       char const * lc_msgs = 0;
+#ifdef HAVE_LC_MESSAGES
+                       lc_msgs = setlocale(LC_MESSAGES, NULL);
+#endif
                        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;
+                                    << ": language(" << lang_ << ")" << std::endl;
        }
 
        ~Pimpl() {}
@@ -107,7 +110,6 @@ public:
                if (m.empty())
                        return m;
 
-               //string oldMSG = setlocale(LC_MESSAGES, NULL);
                // In this order, see support/filetools.C:
                string lang = getEnv("LC_ALL");
                if (lang.empty()) {
@@ -118,11 +120,20 @@ public:
                                        lang = "C";
                        }
                }
-               
+#ifdef HAVE_LC_MESSAGES
                char const * lc_msgs = setlocale(LC_MESSAGES, lang_.c_str());
+#endif
+               // 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
-               if (!lc_msgs)
+               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);
@@ -134,11 +145,11 @@ public:
                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;
+                               << 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());
@@ -157,7 +168,9 @@ public:
                boost::smatch sub;
                if (regex_match(translated, sub, reg))
                        translated = sub.str(1);
+#ifdef HAVE_LC_MESSAGES
                setlocale(LC_MESSAGES, lang.c_str());
+#endif
                setlocale(LC_CTYPE, oldCTYPE.c_str());
                return translated;
        }