From b830dff724fc1ab078b0e7fdca98282d95a7df61 Mon Sep 17 00:00:00 2001 From: gaelle Date: Thu, 10 Apr 2025 12:39:06 +0200 Subject: [PATCH] init language before instantiating qml components for combobox translations --- Linphone/core/App.cpp | 9 +++++---- Linphone/model/core/CoreModel.cpp | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Linphone/core/App.cpp b/Linphone/core/App.cpp index ceb74ce39..1a4281f49 100644 --- a/Linphone/core/App.cpp +++ b/Linphone/core/App.cpp @@ -413,6 +413,11 @@ void App::init() { QThread::msleep(100); } + // Init locale. + mTranslatorCore = new DefaultTranslatorCore(this); + mDefaultTranslatorCore = new DefaultTranslatorCore(this); + initLocale(); + lInfo() << log().arg("Display server : %1").arg(platformName()); } @@ -518,10 +523,6 @@ void App::initCore() { setAutoStart(settings->getAutoStart()); setQuitOnLastWindowClosed(settings->getExitOnClose()); } - // Init locale. - mTranslatorCore = new DefaultTranslatorCore(this); - mDefaultTranslatorCore = new DefaultTranslatorCore(this); - initLocale(); const QUrl url("qrc:/qt/qml/Linphone/view/Page/Window/Main/MainWindow.qml"); QObject::connect( mEngine, &QQmlApplicationEngine::objectCreated, this, diff --git a/Linphone/model/core/CoreModel.cpp b/Linphone/model/core/CoreModel.cpp index 7d44bfcd7..357ae1f8b 100644 --- a/Linphone/model/core/CoreModel.cpp +++ b/Linphone/model/core/CoreModel.cpp @@ -78,7 +78,6 @@ void CoreModel::start() { linphone::Factory::get()->createCore(Utils::appStringToCoreString(Paths::getConfigFilePath(mConfigPath)), Utils::appStringToCoreString(Paths::getFactoryConfigFilePath()), nullptr); setMonitor(mCore); - setPathsAfterCreation(); mCore->enableRecordAware(true); mCore->setVideoDisplayFilter("MSQOGL"); mCore->usePreviewWindow(true);