Partial fix bug 2092: branches not propagated to child documents

[lyx.git] / src / messages.C

diff --git a/src/messages.C b/src/messages.C
index 9c7a8deb5942eef00e800d40273869a87191862a..b98bc8368b0ce247ece0c99e45b7d8262821f7f6 100644 (file)
--- a/src/messages.C
+++ b/src/messages.C
@@ -15,8 +15,11 @@
 #include "support/environment.h"
 #include "support/package.h"
 
+#include <boost/current_function.hpp>
 #include <boost/regex.hpp>
 
+#include <cerrno>
+
 using lyx::support::package;
 using lyx::support::getEnv;
 using lyx::support::setEnv;
@@ -91,7 +94,8 @@ public:
                // strip off any encoding suffix, i.e., assume 8-bit po files
                string::size_type i = lang_.find(".");
                lang_ = lang_.substr(0, i);
-               lyxerr << "Messages: language(" << lang_ << ")" << std::endl;
+               lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION
+                                     << ": language(" << lang_ << ")" << std::endl;
        }
 
        ~Pimpl() {}
@@ -114,6 +118,8 @@ public:
                }
                
                char const * works = setlocale(LC_MESSAGES, lang_.c_str());
+               if (!works)
+                       lyxerr << "Locale " << lang_ << " could not be set" << std::endl;
                // CTYPE controls what getmessage thinks what encoding the po file uses
                string oldCTYPE = setlocale(LC_CTYPE, NULL);
                setlocale(LC_CTYPE, lang_.c_str());
@@ -121,10 +127,12 @@ public:
                char const * c = bindtextdomain(PACKAGE, package().locale_dir().c_str());
                int e = errno;
                if (e) {
-                       lyxerr << "Error code: " << errno << std::endl;
-                       lyxerr << "Lang, mess: " << lang_ << " " << m << std::endl;
-                       lyxerr << "Directory:  " << package().locale_dir() << std::endl;
-                       lyxerr << "Rtn value:  " << c << std::endl;
+                       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;
                }
                textdomain(PACKAGE);
                const char* msg = gettext(m.c_str());