summaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
authorSimon Rettberg2017-12-05 11:29:26 +0100
committerSimon Rettberg2017-12-05 11:29:26 +0100
commitc3c7d5748578d268ae2b8cc076bc5a87479fc768 (patch)
treea885ecf8bb07c39cdb3db5690db2418fca58ac80 /src/server
parent[client] Fix deletion of QThread while still running (diff)
downloadpvs2-c3c7d5748578d268ae2b8cc076bc5a87479fc768.tar.gz
pvs2-c3c7d5748578d268ae2b8cc076bc5a87479fc768.tar.xz
pvs2-c3c7d5748578d268ae2b8cc076bc5a87479fc768.zip
Fix translations on Qt5
Diffstat (limited to 'src/server')
-rw-r--r--src/server/serverapp/serverapp.cpp6
1 files changed, 2 insertions, 4 deletions
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();
}