From 8273224500228157351f21d14f113d9d2904eae8 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Sat, 15 Nov 2008 23:39:44 +0100 Subject: [PATCH] Don't load a Qt translation if we provide our own --- src/common/util.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/common/util.cpp b/src/common/util.cpp index e978a7fb..c267d0bf 100644 --- a/src/common/util.cpp +++ b/src/common/util.cpp @@ -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())); } -- 2.20.1