aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/qml/main.cpp7
-rw-r--r--tools/qmlscene/main.cpp10
2 files changed, 8 insertions, 9 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 6cf6ad3b2c..7dfae2b53d 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -535,10 +535,9 @@ int main(int argc, char *argv[])
verboseMode = false;
#if QT_CONFIG(translation)
- //qt_ translations loaded by QQmlApplicationEngine
- QString sysLocale = QLocale::system().name();
-
- if (!translationFile.isEmpty()) { //Note: installed before QQmlApplicationEngine's automatic translation loading
+ // Need to be installed before QQmlApplicationEngine's automatic translation loading
+ // (qt_ translations are loaded there)
+ if (!translationFile.isEmpty()) {
QTranslator translator;
if (translator.load(translationFile)) {
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index bc7fe72d4c..fab3dcce67 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -311,7 +311,7 @@ static void displayFileDialog(Options *options)
#if QT_CONFIG(translation)
static void loadTranslationFile(QTranslator &translator, const QString& directory)
{
- translator.load(QLatin1String("qml_" )+QLocale::system().name(), directory + QLatin1String("/i18n"));
+ translator.load(QLocale(), QLatin1String("qml"), QLatin1String("_"), directory + QLatin1String("/i18n"));
QCoreApplication::installTranslator(&translator);
}
#endif
@@ -549,12 +549,12 @@ int main(int argc, char ** argv)
}
#if QT_CONFIG(translation)
- QTranslator translator;
+ QLocale locale;
QTranslator qtTranslator;
- QString sysLocale = QLocale::system().name();
- if (qtTranslator.load(QLatin1String("qt_") + sysLocale, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
+ if (qtTranslator.load(locale, QLatin1String("qt"), QLatin1String("_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
app->installTranslator(&qtTranslator);
- if (translator.load(QLatin1String("qmlscene_") + sysLocale, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
+ QTranslator translator;
+ if (translator.load(locale, QLatin1String("qmlscene"), QLatin1String("_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
app->installTranslator(&translator);
QTranslator qmlTranslator;