From 7a3f620141efea644bff6b68a80b07f87628aa99 Mon Sep 17 00:00:00 2001 From: Bas Pape Date: Wed, 28 Aug 2013 20:32:21 +0200 Subject: [PATCH] Use the old way of finding translations for OSX. Many OSX users reported their clients being in Japanese, rather than English, since 0.9.0, which turned out to be due to QSystemLocale::query for QSystemLocal::UILanguages (internally done by Qt if a QLocale is passed to QTranslator::load) returning 'en', rather than the proper local form (e.g. 'en-US'). As 'en' has no translation, the second language got picked up, which happened to be 'ja', which does have a translation. Fixes #1233 (but reintroduces #1194 on OSX) --- src/common/quassel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp index 62b8b3a8..e0817756 100644 --- a/src/common/quassel.cpp +++ b/src/common/quassel.cpp @@ -495,7 +495,7 @@ void Quassel::loadTranslation(const QLocale &locale) quasselTranslator->setObjectName("QuasselTr"); qApp->installTranslator(quasselTranslator); -#if QT_VERSION >= 0x040800 +#if QT_VERSION >= 0x040800 && !defined Q_OS_MAC bool success = qtTranslator->load(locale, QString("qt_"), translationDirPath()); if (!success) qtTranslator->load(locale, QString("qt_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); -- 2.20.1