diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-09-04 14:29:21 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-10-01 15:14:23 +0200 |
| commit | 427646b8d7c52e5b84240e07ffd391217ce3bfa8 (patch) | |
| tree | f02ed979b7f0c0b3620689bf921f040eb87c00b3 /src/qml/qml/qqmlapplicationengine.cpp | |
| parent | b9f143945982ae1775c69b9a09dc5e3912a17324 (diff) | |
use the new form of QTranslator::load() for more flexibility
As the docs explain, the variant of QTranslator::load() taking a
const QLocale& is better because it "uses QLocale::uiLanguages()
and not simply the locale name, which refers to the formatting of
dates and numbers and not necessarily the UI language." And, using
a default-constructed QLocale permits QLocale::setDefault() to
override the system locale, so for example an application's
main.cpp can do that before constructing a QQmlApplicationEngine.
Task-number: QTBUG-7329
Change-Id: Ia29a4c894087c92b071c0fe484728866f2660fe6
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlapplicationengine.cpp')
| -rw-r--r-- | src/qml/qml/qqmlapplicationengine.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlapplicationengine.cpp b/src/qml/qml/qqmlapplicationengine.cpp index 240c01233b..9ccaee7cd7 100644 --- a/src/qml/qml/qqmlapplicationengine.cpp +++ b/src/qml/qml/qqmlapplicationengine.cpp @@ -65,7 +65,8 @@ void QQmlApplicationEnginePrivate::init() q->connect(q, SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit())); #ifndef QT_NO_TRANSLATION QTranslator* qtTranslator = new QTranslator; - if (qtTranslator->load(QLatin1String("qt_") + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath))) + QLocale locale; + if (qtTranslator->load(locale, QLatin1String("qt"), QLatin1String("_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath))) QCoreApplication::installTranslator(qtTranslator); translators << qtTranslator; #endif @@ -82,7 +83,8 @@ void QQmlApplicationEnginePrivate::loadTranslations(const QUrl &rootFile) QFileInfo fi(rootFile.toLocalFile()); QTranslator *translator = new QTranslator; - if (translator->load(QLatin1String("qml_") + QLocale::system().name(), fi.path() + QLatin1String("/i18n"))) { + QLocale locale; + if (translator->load(locale, QLatin1String("qml"), QLatin1String("_"), fi.path() + QLatin1String("/i18n"))) { QCoreApplication::installTranslator(translator); translators << translator; } else { |