anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move a Qt workaround to the Qt frontend.

Browse Source
This commit is contained in:
Jean-Marc Lasgouttes 2013-06-03 18:08:53 +02:00
parent 20799a5ebf
commit deb6e16e79
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/qt4/GuiApplication.cpp
View File

@ -186,7 +186,9 @@ void setLocale()
string const code = l ? l->code() : string();
theLocale = QLocale(toqstr(code));
}
Messages::guiLanguage(fromqstr(theLocale.name()));
string const code = fromqstr(theLocale.name());
// Qt tries to outsmart us and transforms en_US to C.
Messages::guiLanguage((code == "C") ? "en_US" : code);
QLocale::setDefault(theLocale);
setlocale(LC_NUMERIC, "C");
}

4
src/support/Messages.cpp
View File

@ -155,10 +155,8 @@ Messages::Messages(string const & l)
namespace {
// Find the code we have for a given language code. Return empty if not found.
string realCode(string const & c)
string realCode(string code)
{
// Qt tries to outsmart us and transforms en_US to C.
string code = (c == "C") ? "en" : c;
// this loops at most twice
while (true) {
if (package().messages_file(code).isReadableFile())