From a780afe9f9ab9ac6938ee6d9919e2a70e9735cbb Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 26 Oct 2016 15:10:30 +0200
Subject: Fix GUI translation: Don't create persistent objects on stack :/

---
 src/server/serverapp/serverapp.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/server/serverapp/serverapp.cpp')

diff --git a/src/server/serverapp/serverapp.cpp b/src/server/serverapp/serverapp.cpp
index a57c456..c645b39 100644
--- a/src/server/serverapp/serverapp.cpp
+++ b/src/server/serverapp/serverapp.cpp
@@ -15,10 +15,15 @@ ServerApp::ServerApp(int& argc, char** argv)
 
 	_arguments = parseParameters();
 
-	/* use system locale as language to translate gui */
-	QTranslator translator;
-	translator.load(":pvsmgr");
-	installTranslator(&translator);
+	// System strings
+	QTranslator *qtTranslator = new QTranslator(this);
+	qtTranslator->load("qt_" + QLocale::system().name(),
+	QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+	installTranslator(qtTranslator);
+	// App specific
+	QTranslator *translator = new QTranslator(this);
+	translator->load(":pvsmgr");
+	installTranslator(translator);
 
 	/* Set the global path of the settings */
 	QSettings::setPath(QSettings::IniFormat, QSettings::SystemScope, "/opt/");
-- 
cgit v1.2.3-55-g7522