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

Avoid requiring messages with empty language.

Browse Source 
This is a follow-up to commit 8aa2d6b1.
This commit is contained in:
Jean-Marc Lasgouttes 2015-04-15 15:27:05 +02:00
parent 68ad0bfb90
commit d592ec06b9
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,15 +200,13 @@ void setLocale()
if (lyxrc.gui_language == "auto") { if (lyxrc.gui_language == "auto") {
theLocale = QLocale::system(); theLocale = QLocale::system();
code = fromqstr(theLocale.name()); code = fromqstr(theLocale.name());
// Qt tries to outsmart us and transforms en_US to C.
if (code == "C")
code = "en_US";
} else { } else {
Language const * l = languages.getLanguage(lyxrc.gui_language); Language const * l = languages.getLanguage(lyxrc.gui_language);
code = l ? l->code() : string(); code = l ? l->code() : "C";
theLocale = QLocale(toqstr(code)); theLocale = QLocale(toqstr(code));
} }
Messages::guiLanguage(code); // Qt tries to outsmart us and transforms en_US to C.
Messages::guiLanguage((code == "C") ? "en_US" : code);
QLocale::setDefault(theLocale); QLocale::setDefault(theLocale);
setlocale(LC_NUMERIC, "C"); setlocale(LC_NUMERIC, "C");
} }