Don't load a Qt translation if we provide our own
authorManuel Nickschas <sputnick@quassel-irc.org>
Sat, 15 Nov 2008 22:39:44 +0000 (23:39 +0100)
committerManuel Nickschas <sputnick@quassel-irc.org>
Sat, 15 Nov 2008 22:39:44 +0000 (23:39 +0100)
src/common/util.cpp

index e978a7f..c267d0b 100644 (file)
@@ -200,7 +200,9 @@ void loadTranslation(const QLocale &locale) {
   if(locale.language() == QLocale::C)
     return;
 
-  qtTranslator->load(QString("%2/qt_%1").arg(locale.name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath)));
+  bool success = qtTranslator->load(QString(":i18n/qt_%1").arg(locale.name()));
+  if(!success)
+    qtTranslator->load(QString("%2/qt_%1").arg(locale.name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath)));
   quasselTranslator->load(QString(":i18n/quassel_%1").arg(locale.name()));
 }