feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix Qt Creator using wrong UI language.

Browse Source 
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>
This commit is contained in:
Eike Ziller
2012-03-26 12:30:33 +02:00
parent ae070f3277
commit 575aa068fa
1 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/app/main.cpp
View File

@@ -234,10 +234,6 @@ int main(int argc, char **argv)
QtSystemExceptionHandler systemExceptionHandler; QtSystemExceptionHandler systemExceptionHandler;
#endif #endif
QTranslator translator;
QTranslator qtTranslator;
QString locale = QLocale::system().name();
// Manually determine -settingspath command line option // Manually determine -settingspath command line option
// We can't use the regular way of the plugin manager, because that needs to parse pluginspecs // 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 // but the settings path can influence which plugins are enabled
@@ -273,9 +269,20 @@ int main(int argc, char **argv)
pluginManager.setGlobalSettings(globalSettings); pluginManager.setGlobalSettings(globalSettings);
pluginManager.setSettings(settings); 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() const QString &creatorTrPath = QCoreApplication::applicationDirPath()
+ QLatin1String(SHARE_PATH "/translations"); + QLatin1String(SHARE_PATH "/translations");
foreach (const QString &locale, uiLanguages) {
if (translator.load(QLatin1String("qtcreator_") + locale, creatorTrPath)) { if (translator.load(QLatin1String("qtcreator_") + locale, creatorTrPath)) {
const QString &qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath); const QString &qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
const QString &qtTrFile = QLatin1String("qt_") + locale; const QString &qtTrFile = QLatin1String("qt_") + locale;
@@ -284,8 +291,15 @@ int main(int argc, char **argv)
app.installTranslator(&translator); app.installTranslator(&translator);
app.installTranslator(&qtTranslator); app.installTranslator(&qtTranslator);
app.setProperty("qtc_locale", locale); app.setProperty("qtc_locale", locale);
} else { break;
}
translator.load(QString()); // unload() 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;
} }
} }