X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fquassel.cpp;h=62b8b3a8a4a19beb49309ff3aeeeec8b5bf704a9;hp=e9763fc7fec0dcc5c6451ee338069f9681bbe60b;hb=12fbdede1ac2d35359eab076ccecb203c04139c4;hpb=4a5065255e652dd0c301bac0db41b7afb777ef49

diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index e9763fc7..62b8b3a8 100644
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -40,6 +40,7 @@
 #include "bufferinfo.h"
 #include "types.h"
 #include "syncableobject.h"
+#include "logger.h"
 
 Quassel::BuildInfo Quassel::_buildInfo;
 AbstractCliParser *Quassel::_cliParser = 0;
@@ -494,10 +495,15 @@ void Quassel::loadTranslation(const QLocale &locale)
     quasselTranslator->setObjectName("QuasselTr");
     qApp->installTranslator(quasselTranslator);
 
-    QLocale::setDefault(locale);
-
+#if QT_VERSION >= 0x040800
+    bool success = qtTranslator->load(locale, QString("qt_"), translationDirPath());
+    if (!success)
+        qtTranslator->load(locale, QString("qt_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+    quasselTranslator->load(locale, QString(""), translationDirPath());
+#else
     bool success = qtTranslator->load(QString("qt_%1").arg(locale.name()), translationDirPath());
     if (!success)
         qtTranslator->load(QString("qt_%1").arg(locale.name()), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
     quasselTranslator->load(QString("%1").arg(locale.name()), translationDirPath());
+#endif
 }