init language before instantiating qml components for combobox translations
This commit is contained in:
parent
42a6a7a3b7
commit
b830dff724
2 changed files with 5 additions and 5 deletions
|
|
@ -413,6 +413,11 @@ void App::init() {
|
||||||
QThread::msleep(100);
|
QThread::msleep(100);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Init locale.
|
||||||
|
mTranslatorCore = new DefaultTranslatorCore(this);
|
||||||
|
mDefaultTranslatorCore = new DefaultTranslatorCore(this);
|
||||||
|
initLocale();
|
||||||
|
|
||||||
lInfo() << log().arg("Display server : %1").arg(platformName());
|
lInfo() << log().arg("Display server : %1").arg(platformName());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -518,10 +523,6 @@ void App::initCore() {
|
||||||
setAutoStart(settings->getAutoStart());
|
setAutoStart(settings->getAutoStart());
|
||||||
setQuitOnLastWindowClosed(settings->getExitOnClose());
|
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");
|
const QUrl url("qrc:/qt/qml/Linphone/view/Page/Window/Main/MainWindow.qml");
|
||||||
QObject::connect(
|
QObject::connect(
|
||||||
mEngine, &QQmlApplicationEngine::objectCreated, this,
|
mEngine, &QQmlApplicationEngine::objectCreated, this,
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,6 @@ void CoreModel::start() {
|
||||||
linphone::Factory::get()->createCore(Utils::appStringToCoreString(Paths::getConfigFilePath(mConfigPath)),
|
linphone::Factory::get()->createCore(Utils::appStringToCoreString(Paths::getConfigFilePath(mConfigPath)),
|
||||||
Utils::appStringToCoreString(Paths::getFactoryConfigFilePath()), nullptr);
|
Utils::appStringToCoreString(Paths::getFactoryConfigFilePath()), nullptr);
|
||||||
setMonitor(mCore);
|
setMonitor(mCore);
|
||||||
setPathsAfterCreation();
|
|
||||||
mCore->enableRecordAware(true);
|
mCore->enableRecordAware(true);
|
||||||
mCore->setVideoDisplayFilter("MSQOGL");
|
mCore->setVideoDisplayFilter("MSQOGL");
|
||||||
mCore->usePreviewWindow(true);
|
mCore->usePreviewWindow(true);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue