From c8408547ade3707dfd7919f9daf1fb6fa249297d Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Sat, 18 Apr 2020 22:09:35 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B4=D0=BC=D0=BE=D0=B4=D1=83?= =?UTF-8?q?=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/cmlib | 2 +- cmake/etc/uncrustify | 2 +- src/myx/qt/translators.cpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/cmlib b/cmake/cmlib index 9c6148a..8a09a61 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit 9c6148ab8280c0f4fd8f8d43e7c2526e43ac75f9 +Subproject commit 8a09a61d523c42f4cd5bb4a17a1bea6c8cf95fc9 diff --git a/cmake/etc/uncrustify b/cmake/etc/uncrustify index eb34f3f..0cd764f 160000 --- a/cmake/etc/uncrustify +++ b/cmake/etc/uncrustify @@ -1 +1 @@ -Subproject commit eb34f3ffb32205b382c4ee56de890b5de9371fa7 +Subproject commit 0cd764fc187ab3b66cb31a5549f13b3336858894 diff --git a/src/myx/qt/translators.cpp b/src/myx/qt/translators.cpp index 771fe42..8060dba 100644 --- a/src/myx/qt/translators.cpp +++ b/src/myx/qt/translators.cpp @@ -36,8 +36,9 @@ void append_translators( QTranslatorsList& translators, const QString& appName ) translator->deleteLater(); } + translator = new QTranslator( qApp ); - if ( translator->load( QStringLiteral( "qtbase_" ) + QLocale::system().name(), + if ( translator->load( "qtbase_" + QLocale::system().name(), QLibraryInfo::location( QLibraryInfo::TranslationsPath ) ) ) { translators.append( translator );