diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2012-05-31 12:22:12 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-05-31 12:43:13 +0200 |
| commit | 6026a4a51c04d589ae73b0204c2db54e7d0ff0c0 (patch) | |
| tree | 40b8239b485cb40bfefa2828c43f80c6393908cd | |
| parent | 23fcc1a82399051902c6ab853bfafecc20744b2e (diff) | |
| download | qt-creator-6026a4a51c04d589ae73b0204c2db54e7d0ff0c0.tar.gz | |
Fix default ui language on Linux.
On systems where uiLanguages returns something containing "-"
(e.g. "de-DE", see QTBUG-25973)
Change-Id: Ibe2db6a7a6ed893795e3f3110b33c39225bed751
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | src/app/main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp index d22cccd51e..4b1a327f0c 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -283,7 +283,8 @@ int main(int argc, char **argv) uiLanguages.prepend(overrideLanguage); const QString &creatorTrPath = QCoreApplication::applicationDirPath() + QLatin1String(SHARE_PATH "/translations"); - foreach (const QString &locale, uiLanguages) { + foreach (QString locale, uiLanguages) { + locale.replace(QLatin1Char('-'), QLatin1Char('_')); // work around QTBUG-25973 if (translator.load(QLatin1String("qtcreator_") + locale, creatorTrPath)) { const QString &qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath); const QString &qtTrFile = QLatin1String("qt_") + locale; |