From: Bas Pape <baspape@gmail.com>
Date: Wed, 28 Aug 2013 18:32:21 +0000 (+0200)
Subject: Use the old way of finding translations for OSX.
X-Git-Tag: 0.10-beta1~120
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=7a3f620141efea644bff6b68a80b07f87628aa99

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)
---

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));