diff --git a/vendor/DOtherSide/lib/include/DOtherSide/DOtherSide.h b/vendor/DOtherSide/lib/include/DOtherSide/DOtherSide.h index 985696770d..8f0daee39b 100644 --- a/vendor/DOtherSide/lib/include/DOtherSide/DOtherSide.h +++ b/vendor/DOtherSide/lib/include/DOtherSide/DOtherSide.h @@ -172,7 +172,8 @@ DOS_API void DOS_CALL dos_qqmlapplicationengine_load_data(DosQQmlApplicationEngi /// \brief Calls the load and install function for translations and calls retranslate on QQmlApplicationEngine /// \param vptr The QQmlApplicationEngine /// \param data The UTF-8 string of the path to the translation file (.qm) -DOS_API void DOS_CALL dos_qapplication_load_translation(DosQQmlApplicationEngine *vptr, const char* translationPackage); +/// \param shouldRetranslate Should retranslate() be called after loading a translation +DOS_API void DOS_CALL dos_qapplication_load_translation(DosQQmlApplicationEngine *vptr, const char* translationPackage, bool shouldRetranslate); /// \brief Calls the QQmlApplicationEngine::addImportPath function /// \param vptr The QQmlApplicationEngine diff --git a/vendor/DOtherSide/lib/src/DOtherSide.cpp b/vendor/DOtherSide/lib/src/DOtherSide.cpp index 0be67b12e5..da4df54aa2 100644 --- a/vendor/DOtherSide/lib/src/DOtherSide.cpp +++ b/vendor/DOtherSide/lib/src/DOtherSide.cpp @@ -259,7 +259,7 @@ void dos_qqmlapplicationengine_load_data(::DosQQmlApplicationEngine *vptr, const engine->loadData(data); } -void dos_qapplication_load_translation(::DosQQmlApplicationEngine *vptr, const char* translationPackage) +void dos_qapplication_load_translation(::DosQQmlApplicationEngine *vptr, const char* translationPackage, bool shouldRetranslate) { if (!m_translator->isEmpty()) { QCoreApplication::removeTranslator(m_translator); @@ -267,7 +267,7 @@ void dos_qapplication_load_translation(::DosQQmlApplicationEngine *vptr, const c if (m_translator->load(translationPackage)) { bool success = QCoreApplication::installTranslator(m_translator); auto engine = static_cast(vptr); - engine->retranslate(); + if (shouldRetranslate) engine->retranslate(); } else { printf("Failed to load translation file %s\n", translationPackage); }