From 295c6e808ab15c8f10326d375c7c4cdd80531e5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Wed, 23 Nov 2016 02:25:49 +0100 Subject: NOISSUE fix translation listing in settings and translation loading It was impossible to select and load translations properly. --- application/MultiMC.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'application/MultiMC.cpp') diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp index 6c7deca1..2a903437 100644 --- a/application/MultiMC.cpp +++ b/application/MultiMC.cpp @@ -406,15 +406,17 @@ void MultiMC::initNetwork() void MultiMC::initTranslations() { - QLocale locale(m_settings->get("Language").toString()); + auto bcp47Name = m_settings->get("Language").toString(); + QLocale locale(bcp47Name); QLocale::setDefault(locale); - qDebug() << "Your language is" << locale.bcp47Name(); + qDebug() << "Your language is" << bcp47Name; + // FIXME: this is likely never present. m_qt_translator.reset(new QTranslator()); - if (m_qt_translator->load("qt_" + locale.bcp47Name(), + if (m_qt_translator->load("qt_" + bcp47Name, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) { qDebug() << "Loading Qt Language File for" - << locale.bcp47Name().toLocal8Bit().constData() << "..."; + << bcp47Name.toLocal8Bit().constData() << "..."; if (!installTranslator(m_qt_translator.get())) { qCritical() << "Loading Qt Language File failed."; @@ -427,10 +429,10 @@ void MultiMC::initTranslations() } m_mmc_translator.reset(new QTranslator()); - if (m_mmc_translator->load("mmc_" + locale.bcp47Name(), FS::PathCombine(QDir::currentPath(), "translations"))) + if (m_mmc_translator->load("mmc_" + bcp47Name, FS::PathCombine(QDir::currentPath(), "translations"))) { qDebug() << "Loading MMC Language File for" - << locale.bcp47Name().toLocal8Bit().constData() << "..."; + << bcp47Name.toLocal8Bit().constData() << "..."; if (!installTranslator(m_mmc_translator.get())) { qCritical() << "Loading MMC Language File failed."; -- cgit v1.2.3