* 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.
*/
void Messages::setDefaultLanguage()
{
- char * env_lang[5] = {"LANGUAGE", "LC_ALL", "LC_MESSAGES", "LC_MESSAGE",
- "LANG"};
+ 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())
int e = errno;
if (e) {
LYXERR(Debug::LOCALE, "Error code: " << errno << '\n'
- << "Directory : " << package().locale_dir().absFilename() << '\n'
+ << "Directory : " << package().locale_dir().absFileName() << '\n'
<< "Rtn value : " << c);
}
// 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
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) {
+ 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 {
// 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);
namespace lyx {
-Messages::Messages(string const & l) {}
+Messages::Messages(string const & /* l */) {}
void Messages::init()
{