From dbcfda6f073ab1c72d8dc0c3a9325c59f083642d Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Thu, 31 May 2018 00:25:00 +0200 Subject: [PATCH] core: Only load translations if running stand-alone For the monolithic client, the UI part takes care of loading the translations configured by the user; the core should not override them. Only if the core is running stand-alone, it needs to load translations itself (using the system locale, since there is no core-side configuration for this). --- src/core/core.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core/core.cpp b/src/core/core.cpp index b103b42d..3089a739 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -104,7 +104,9 @@ bool Core::init() { _startTime = QDateTime::currentDateTime().toUTC(); // for uptime :) - Quassel::loadTranslation(QLocale::system()); + if (Quassel::runMode() == Quassel::RunMode::CoreOnly) { + Quassel::loadTranslation(QLocale::system()); + } // check settings version // so far, we only have 1 -- 2.20.1