From 575aa068fabb4f20aef1dc991d781d6534a457fc Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@nokia.com>
Date: Mon, 26 Mar 2012 12:30:33 +0200
Subject: [PATCH] Fix Qt Creator using wrong UI language.

Qt 4.8 introduced QLocale::uiLanguages() and changed the behavior of
QLocale::system().name(). We now retrieve the list of preferred
uiLanguages when building against 4.8, and look for the first language
that we have translations for.

Task-number: QTCREATORBUG-7134
Change-Id: I90cdb6182732a013dc431b61a7976900e48e0d31
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
 src/app/main.cpp | 42 ++++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/app/main.cpp b/src/app/main.cpp
index 612aadd0553..0fbbc5e1b01 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -234,10 +234,6 @@ int main(int argc, char **argv)
     QtSystemExceptionHandler systemExceptionHandler;
 #endif
 
-    QTranslator translator;
-    QTranslator qtTranslator;
-    QString locale = QLocale::system().name();
-
     // Manually determine -settingspath command line option
     // We can't use the regular way of the plugin manager, because that needs to parse pluginspecs
     // but the settings path can influence which plugins are enabled
@@ -273,19 +269,37 @@ int main(int argc, char **argv)
     pluginManager.setGlobalSettings(globalSettings);
     pluginManager.setSettings(settings);
 
-    locale = settings->value("General/OverrideLanguage", locale).toString();
+    QTranslator translator;
+    QTranslator qtTranslator;
+    QStringList uiLanguages;
+#if QT_VERSION >= 0x040800
+    uiLanguages = QLocale::system().uiLanguages();
+#else
+    uiLanguages << QLocale::system().name();
+#endif
+    QString overrideLanguage = settings->value("General/OverrideLanguage").toString();
+    if (!overrideLanguage.isEmpty())
+        uiLanguages.prepend(overrideLanguage);
     const QString &creatorTrPath = QCoreApplication::applicationDirPath()
             + QLatin1String(SHARE_PATH "/translations");
-    if (translator.load(QLatin1String("qtcreator_") + locale, creatorTrPath)) {
-        const QString &qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
-        const QString &qtTrFile = QLatin1String("qt_") + locale;
-        // Binary installer puts Qt tr files into creatorTrPath
-        if (qtTranslator.load(qtTrFile, qtTrPath) || qtTranslator.load(qtTrFile, creatorTrPath)) {
-            app.installTranslator(&translator);
-            app.installTranslator(&qtTranslator);
-            app.setProperty("qtc_locale", locale);
-        } else {
+    foreach (const QString &locale, uiLanguages) {
+        if (translator.load(QLatin1String("qtcreator_") + locale, creatorTrPath)) {
+            const QString &qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+            const QString &qtTrFile = QLatin1String("qt_") + locale;
+            // Binary installer puts Qt tr files into creatorTrPath
+            if (qtTranslator.load(qtTrFile, qtTrPath) || qtTranslator.load(qtTrFile, creatorTrPath)) {
+                app.installTranslator(&translator);
+                app.installTranslator(&qtTranslator);
+                app.setProperty("qtc_locale", locale);
+                break;
+            }
             translator.load(QString()); // unload()
+        } else if (locale == QLatin1String("C") /* overrideLanguage == "English" */) {
+            // use built-in
+            break;
+        } else if (locale.startsWith(QLatin1String("en")) /* "English" is built-in */) {
+            // use built-in
+            break;
         }
     }