From c3c7d5748578d268ae2b8cc076bc5a87479fc768 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 5 Dec 2017 11:29:26 +0100
Subject: Fix translations on Qt5

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

(limited to 'src/server')

diff --git a/src/server/serverapp/serverapp.cpp b/src/server/serverapp/serverapp.cpp
index 3df996c..7ee06e0 100644
--- a/src/server/serverapp/serverapp.cpp
+++ b/src/server/serverapp/serverapp.cpp
@@ -28,19 +28,17 @@ ServerApp::ServerApp(int& argc, char** argv)
 
 	// System strings
 	QTranslator *qtTranslator = new QTranslator(this);
-	qtTranslator->load("qt_" + QLocale::system().name(),
-	QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+	qtTranslator->load(QLocale::system(), "qt", "_", QLibraryInfo::location(QLibraryInfo::TranslationsPath));
 	installTranslator(qtTranslator);
 	// App specific
 	QTranslator *translator = new QTranslator(this);
-	translator->load(":pvsmgr");
+	translator->load(QLocale::system(), ":", "l_");
 	installTranslator(translator);
 
 	/* Set the global path of the settings */
 	QSettings::setPath(QSettings::IniFormat, QSettings::SystemScope, "/opt/");
 	QSharedPointer<QSettings> sys = getSettings();
 	qDebug() << "System settings are in:" << sys->fileName();
-	QFileInfo sysfi(sys->fileName());
 
 	_mainWindow = new MainWindow();
 }
-- 
cgit v1.2.3-55-g7522