diff options
| author | Simon Rettberg | 2016-10-26 15:10:30 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-10-26 15:10:30 +0200 |
| commit | a780afe9f9ab9ac6938ee6d9919e2a70e9735cbb (patch) | |
| tree | a5130c901737b905ad73c0b60af2ece46c222801 /src/server/serverapp/serverapp.cpp | |
| parent | [client] Create config dir before trying to create vnc password file inside (diff) | |
| download | pvs2-a780afe9f9ab9ac6938ee6d9919e2a70e9735cbb.tar.gz pvs2-a780afe9f9ab9ac6938ee6d9919e2a70e9735cbb.tar.xz pvs2-a780afe9f9ab9ac6938ee6d9919e2a70e9735cbb.zip | |
Fix GUI translation: Don't create persistent objects on stack :/
Diffstat (limited to 'src/server/serverapp/serverapp.cpp')
| -rw-r--r-- | src/server/serverapp/serverapp.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
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/"); |