commit deb6e16e795270551e765b1b62465e15b5fbc30e
Author: Jean-Marc Lasgouttes <[email protected]>
Date: Mon Jun 3 18:08:53 2013 +0200
Move a Qt workaround to the Qt frontend.
diff --git a/src/frontends/qt4/GuiApplication.cpp
b/src/frontends/qt4/GuiApplication.cpp
index 19e9b2b..53fb170 100644
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -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");
}
diff --git a/src/support/Messages.cpp b/src/support/Messages.cpp
index 4eeea5f..906ec3b 100644
--- a/src/support/Messages.cpp
+++ b/src/support/Messages.cpp
@@ -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())
