* Messages.cpp (get):

- set again bind_textdomain_codeset before calling gettext.
	  This works around the infamous bug #7371

Patch from Peter Kümmel.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@38326 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2011-04-10 17:08:08 +00:00
parent 6fb53341b7
commit a7376741ac
2 changed files with 9 additions and 0 deletions

View File

@ -154,6 +154,11 @@ docstring const Messages::get(string const & m) const
#endif #endif
} }
// FIXME: gettext sometimes "forgets" the ucs4_codeset we set
// in init(), which leads to severe message corruption (#7371)
// We set it again here unconditionally. A real fix must be found!
LASSERT(bind_textdomain_codeset(PACKAGE, ucs4_codeset), /**/);
char const * m_c = m.c_str(); char const * m_c = m.c_str();
char const * trans_c = gettext(m_c); char const * trans_c = gettext(m_c);
docstring trans; docstring trans;

View File

@ -62,6 +62,10 @@ What's new
* USER INTERFACE * USER INTERFACE
- Fix corruption of localized messages while changing color preferences,
which could result in a non-functional lyx instance, an assertion and
dataloss (bug 7371).
- Fix a crash when editing the name of an unknown math macro with an argument - Fix a crash when editing the name of an unknown math macro with an argument
which is immediately followed by another unknown math macro (bug 7316). which is immediately followed by another unknown math macro (bug 7316).