Commit 1773ee45 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Qt Designer: Load translations only when designer_<LANG>.qm is present.


Try to load designer_<LANG>.qm first and load qt_<LANG>.qm only
if the former succeeds.

Task-number: QTBUG-41790
Change-Id: Id4862019edf81da81bf9d059c586bbfee18ab7e6
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@digia.com>
Showing with 7 additions and 12 deletions
...@@ -209,19 +209,14 @@ void QDesigner::initialize() ...@@ -209,19 +209,14 @@ void QDesigner::initialize()
QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
parseCommandLineArgs(files, resourceDir); parseCommandLineArgs(files, resourceDir);
QTranslator *translator = new QTranslator(this);
QTranslator *qtTranslator = new QTranslator(this);
const QString localSysName = QLocale::system().name(); const QString localSysName = QLocale::system().name();
QString translatorFileName = QStringLiteral("designer_"); QScopedPointer<QTranslator> designerTranslator(new QTranslator(this));
translatorFileName += localSysName; if (designerTranslator->load(QStringLiteral("designer_") + localSysName, resourceDir)) {
translator->load(translatorFileName, resourceDir); installTranslator(designerTranslator.take());
QScopedPointer<QTranslator> qtTranslator(new QTranslator(this));
translatorFileName = QStringLiteral("qt_"); if (qtTranslator->load(QStringLiteral("qt_") + localSysName, resourceDir))
translatorFileName += localSysName; installTranslator(qtTranslator.take());
qtTranslator->load(translatorFileName, resourceDir); }
installTranslator(translator);
installTranslator(qtTranslator);
m_workbench = new QDesignerWorkbench(); m_workbench = new QDesignerWorkbench();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment