diff options
author | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-10-16 10:10:04 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-10-28 12:37:05 +0100 |
commit | 05d8ffb4dff5e693967c8ee7cee6d6158eadccbd (patch) | |
tree | f0784506f4575f24062f6a8687ae198d6f635ada /tools/qmlscene | |
parent | 94297b4ca50439d27dd5c3de6ff225185647cc46 (diff) |
Revert: use the new form of QTranslator::load() for more flexibility
This reverts commit 427646b8d7c52e5b84240e07ffd391217ce3bfa8.
It seems that it should have been more correct, but we are still not
shipping English translations, and static QString find_translation()
in qtranslator.cpp will return any language which is in
QLocale::uiLanguages() for which the translation file is found.
That is a long list on OSX.
Reverting the patch means find_translation() is not called in
such cases. This change can be re-done whenever we are more sure
that the attempt to find a translation will succeed in finding a
sensible one, or fall back to not translating, rather than choosing
a language that the user didn't intend.
Task-number: QTBUG-41977
Change-Id: I425946cc71cec96b4f38629eb2b7e80220c5236d
Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
Diffstat (limited to 'tools/qmlscene')
-rw-r--r-- | tools/qmlscene/main.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index 7c2fd9fc32..208226c8aa 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -307,8 +307,7 @@ static void displayFileDialog(Options *options) #ifndef QT_NO_TRANSLATION static void loadTranslationFile(QTranslator &translator, const QString& directory) { - QLocale locale; - translator.load(locale, QLatin1String("qml"), QLatin1String("_"), directory + QLatin1String("/i18n")); + translator.load(QLatin1String("qml_" )+QLocale::system().name(), directory + QLatin1String("/i18n")); QCoreApplication::installTranslator(&translator); } #endif @@ -416,18 +415,17 @@ int main(int argc, char ** argv) app.setOrganizationDomain("qt-project.org"); #ifndef QT_NO_TRANSLATION - QLocale locale; + QTranslator translator; QTranslator qtTranslator; - if (qtTranslator.load(locale, QLatin1String("qt"), QLatin1String("_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath))) + QString sysLocale = QLocale::system().name(); + if (qtTranslator.load(QLatin1String("qt_") + sysLocale, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) app.installTranslator(&qtTranslator); - - QTranslator translator; - if (translator.load(locale, QLatin1String("qmlscene"), QLatin1String("_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath))) + if (translator.load(QLatin1String("qmlscene_") + sysLocale, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) app.installTranslator(&translator); QTranslator qmlTranslator; if (!options.translationFile.isEmpty()) { - if (qmlTranslator.load(locale, options.translationFile)) { + if (qmlTranslator.load(options.translationFile)) { app.installTranslator(&qmlTranslator); } else { qWarning() << "Could not load the translation file" << options.translationFile; |