* 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.
*/
#include "support/Package.h"
#include "support/unicode.h"
-#include <boost/assert.hpp>
-#include <boost/current_function.hpp>
+#include "support/lassert.h"
#include <cerrno>
-using std::map;
-using std::string;
+using namespace std;
-namespace {
+namespace lyx {
+
+// Instanciate static member.
+string Messages::main_lang_;
-using lyx::docstring;
-using lyx::from_ascii;
+namespace {
void cleanTranslation(docstring & trans)
{
}
}
-}
+} // anonymous
+} // lyx
#ifdef ENABLE_NLS
# include "../../intl/libintl.h"
# endif
+using namespace lyx::support;
+
namespace lyx {
-using support::package;
-using support::getEnv;
-using support::setEnv;
+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.
: lang_(l), warned_(false)
{
// strip off any encoding suffix, i.e., assume 8-bit po files
- string::size_type i = lang_.find(".");
+ size_t i = lang_.find(".");
lang_ = lang_.substr(0, i);
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
- << ": language(" << lang_ << ")");
+ LYXERR(Debug::LOCALE, "language(" << lang_ << ")");
}
char const * c = bindtextdomain(PACKAGE, locale_dir.c_str());
int e = errno;
if (e) {
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION << '\n'
- << "Error code: " << errno << '\n'
+ LYXERR(Debug::LOCALE, "Error code: " << errno << '\n'
<< "Directory : " << package().locale_dir().absFilename() << '\n'
<< "Rtn value : " << c);
}
if (!bind_textdomain_codeset(PACKAGE, ucs4_codeset)) {
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION << '\n'
- << "Error code: " << errno << '\n'
- << "Codeset : " << ucs4_codeset << '\n');
+ LYXERR(Debug::LOCALE, "Error code: " << errno << '\n'
+ << "Codeset : " << ucs4_codeset);
}
textdomain(PACKAGE);
+
+ // Reset default language;
+ setDefaultLanguage();
}
return it->second;
// The string was not found, use gettext to generate it
-
- string const oldLANGUAGE = getEnv("LANGUAGE");
- 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.
- setEnv("LANGUAGE", lang_);
+ 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
// locale is "C". Therefore we set the locale to
// something that is believed to exist on most
// systems. The idea is that one should be able to
// load German documents even without having de_DE
// installed.
- setEnv("LC_ALL", "en_US");
+ LYXERR(Debug::LOCALE, "Setting LC_ALL to en_US");
+ if (!setEnv("LC_ALL", "en_US"))
+ LYXERR(Debug::LOCALE, "\t... failed!");
#ifdef HAVE_LC_MESSAGES
setlocale(LC_MESSAGES, "");
#endif
char const * trans_c = gettext(m_c);
docstring trans;
if (!trans_c)
- LYXERR0("Undefined result from gettext");
+ LYXERR(Debug::LOCALE, "Undefined result from gettext");
else if (trans_c == m_c) {
- LYXERR(Debug::DEBUG, "Same as entered returned");
+ //LYXERR(Debug::LOCALE, "Same as entered returned");
trans = from_ascii(m);
} else {
- LYXERR(Debug::DEBUG, "We got a translation");
+ //LYXERR(Debug::LOCALE, "We got a translation");
// m is actually not a char const * but ucs4 data
trans = reinterpret_cast<char_type const *>(trans_c);
}
// Reset environment variables as they were.
if (!lang_.empty()) {
// Reset everything as it was.
- setEnv("LANGUAGE", oldLANGUAGE);
- setEnv("LC_ALL", oldLC_ALL);
+ 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);
+ if (!setEnv("LC_ALL", oldLC_ALL))
+ LYXERR(Debug::LOCALE, "\t... failed!");
#ifdef HAVE_LC_MESSAGES
setlocale(LC_MESSAGES, "");
#endif
}
- std::pair<TranslationCache::iterator, bool> result =
- cache_.insert(std::make_pair(m, trans));
+ pair<TranslationCache::iterator, bool> result =
+ cache_.insert(make_pair(m, trans));
- BOOST_ASSERT(result.second);
+ LASSERT(result.second, /**/);
return result.first->second;
}
// libstdc++ that is distributed with GNU G++.
class Messages::Pimpl {
public:
- typedef std::messages<char>::catalog catalog;
+ typedef messages<char>::catalog catalog;
Pimpl(string const & l)
: lang_(l),
loc_gl(lang_.c_str()),
- mssg_gl(std::use_facet<std::messages<char> >(loc_gl))
+ mssg_gl(use_facet<messages<char> >(loc_gl))
{
//LYXERR("Messages: language(" << l << ") in dir(" << dir << ")");
///
string lang_;
///
- std::locale loc_gl;
+ locale loc_gl;
///
- std::messages<char> const & mssg_gl;
+ messages<char> const & mssg_gl;
///
catalog cat_gl;
};
projects / lyx.git / blobdiff