# HG changeset patch # User Wuzzy # Date 1448133765 -3600 # Node ID 637fb0558a73a535dc9f7c641772148c39792e64 # Parent 6f119783a1adb69759c00dea16f39d2c3cefb0a8 Load Qt library's translation diff -r 6f119783a1ad -r 637fb0558a73 QTfrontend/main.cpp --- a/QTfrontend/main.cpp Thu Nov 19 13:30:34 2015 +0300 +++ b/QTfrontend/main.cpp Sat Nov 21 20:22:45 2015 +0100 @@ -28,6 +28,7 @@ #include #include #include +#include #include "hwform.h" #include "hwconsts.h" @@ -318,7 +319,8 @@ engine->setWriteDir(cfgdir->absolutePath()); engine->mountPacks(); - QTranslator Translator; + QTranslator TranslatorHedgewars; + QTranslator TranslatorQt; { QSettings settings(DataManager::instance().settingsFileName(), QSettings::IniFormat); settings.setIniCodec("UTF-8"); @@ -333,10 +335,13 @@ cc = HWApplication::keyboardInputLocale().name(); } - // load locale file into translator - if (!Translator.load(QString("physfs://Locale/hedgewars_%1").arg(cc))) - qWarning("Failed to install translation (%s)", qPrintable(cc)); - app.installTranslator(&Translator); + // Load locale files into translators + if (!TranslatorHedgewars.load(QString("physfs://Locale/hedgewars_%1").arg(cc))) + qWarning("Failed to install Hedgewars translation (%s)", qPrintable(cc)); + if (!TranslatorQt.load(QString("%1/qt_%2").arg(QLibraryInfo::location(QLibraryInfo::TranslationsPath), cc))) + qWarning("Failed to install Qt translation (%s)", qPrintable(cc)); + app.installTranslator(&TranslatorHedgewars); + app.installTranslator(&TranslatorQt); app.setLayoutDirection(QLocale(cc).textDirection()); }