mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Use only one codeset definition
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17403 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
f9a423c9a6
commit
a9266cbdf0
@ -13,6 +13,7 @@
|
||||
#include "debug.h"
|
||||
#include "support/filetools.h"
|
||||
#include "support/package.h"
|
||||
#include "support/unicode.h"
|
||||
|
||||
#include <boost/current_function.hpp>
|
||||
|
||||
@ -122,16 +123,11 @@ public:
|
||||
<< "Rtn value : " << c << endl;
|
||||
}
|
||||
|
||||
#ifdef WORDS_BIGENDIAN
|
||||
static const char * codeset = "UCS-4BE";
|
||||
#else
|
||||
static const char * codeset = "UCS-4LE";
|
||||
#endif
|
||||
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;
|
||||
}
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
#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>
|
||||
@ -52,12 +52,6 @@ using support::getEnv;
|
||||
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), warned_(false)
|
||||
@ -129,11 +123,11 @@ docstring const Messages::get(string const & m) const
|
||||
<< "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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user