#include "support/environment.h"
#include "support/filetools.h"
#include "support/package.h"
-#include "support/types.h"
+#include "support/unicode.h"
#include <boost/current_function.hpp>
#include <boost/regex.hpp>
using support::setEnv;
-#ifdef WORDS_BIGENDIAN
- char const * codeset = "UCS-4BE";
-#else
- char const * codeset = "UCS-4LE";
-#endif
-
// This version use the traditional gettext.
Messages::Messages(string const & l)
- : lang_(l)
+ : lang_(l), warned_(false)
{
if ( lang_.empty() ) {
char const * lc_msgs = 0;
// Since this method gets called for every translatable
// buffer string like e.g. "Figure:" we warn only once.
#if !defined(_WIN32) && !defined(__CYGWIN__)
- bool warned = false;
- if (!warned && !lc_msgs) {
- warned = true;
+ if (!warned_ && !lc_msgs) {
+ warned_ = true;
lyxerr << "Locale " << lang_ << " could not be set" << endl;
}
#endif
<< "Rtn value : " << c << endl;
}
- if (!bind_textdomain_codeset(PACKAGE, codeset)) {
+ if (!bind_textdomain_codeset(PACKAGE, ucs4_codeset)) {
lyxerr[Debug::DEBUG]
<< BOOST_CURRENT_FUNCTION << '\n'
<< "Error code: " << errno << '\n'
- << "Codeset : " << codeset << '\n'
+ << "Codeset : " << ucs4_codeset << '\n'
<< endl;
}