From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Wed, 30 May 2018 22:25:00 +0000 (+0200)
Subject: core: Only load translations if running stand-alone
X-Git-Tag: travis-deploy-test~65
X-Git-Url: https://git.quassel-irc.org/?a=commitdiff_plain;h=dbcfda6f073ab1c72d8dc0c3a9325c59f083642d;p=quassel.git

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).
---

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