summaryrefslogtreecommitdiffstats
path: root/src/designer/src/designer
diff options
context:
space:
mode:
authorMiłosz Kosobucki <milosz@kosobucki.pl>2020-05-10 20:11:30 +0200
committerMiłosz Kosobucki <milosz@kosobucki.pl>2020-05-12 18:16:00 +0200
commit5f4ed04d3aaba18437703a09d5091afbcb8c6280 (patch)
treed8f4170f795679a55b27d682f16fb87a165d6653 /src/designer/src/designer
parentc21ea2f13eae86958caf7e80a60a74fe182aaa7e (diff)
Fix language selection in Designer, Linguist and Assistant
Previous way of loading translation didn't use the proper QTranslator::load() overload. Because of that, the name of the locale was used which may be different than user's preferred display language. See also https://codereview.qt-project.org/c/qt/qtdoc/+/297560 Change-Id: Icbb5d4c94c2d627e521005dcd90a1a0de495c63c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/designer/src/designer')
-rw-r--r--src/designer/src/designer/qdesigner.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/designer/src/designer/qdesigner.cpp b/src/designer/src/designer/qdesigner.cpp
index 75ab2b01b..164a7a1a8 100644
--- a/src/designer/src/designer/qdesigner.cpp
+++ b/src/designer/src/designer/qdesigner.cpp
@@ -239,12 +239,11 @@ QDesigner::ParseArgumentsResult QDesigner::parseCommandLineArguments()
if (options.enableInternalDynamicProperties)
QDesignerPropertySheet::setInternalDynamicPropertiesEnabled(true);
- const QString localSysName = QLocale::system().name();
QScopedPointer<QTranslator> designerTranslator(new QTranslator(this));
- if (designerTranslator->load(QStringLiteral("designer_") + localSysName, options.resourceDir)) {
+ if (designerTranslator->load(QLocale(), QStringLiteral("designer"), QStringLiteral("_"), options.resourceDir)) {
installTranslator(designerTranslator.take());
QScopedPointer<QTranslator> qtTranslator(new QTranslator(this));
- if (qtTranslator->load(QStringLiteral("qt_") + localSysName, options.resourceDir))
+ if (qtTranslator->load(QLocale(), QStringLiteral("qt"), QStringLiteral("_"), options.resourceDir))
installTranslator(qtTranslator.take());
}