From 96900dbce3aaa1fcac74a07a71482c5c6fcd3cab Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 2 Sep 2010 21:21:15 +0000 Subject: * Large set of SuSE patches to fix bugs and add functionality * kdemm is included but not used by knotify as it does not work out of the box git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1171141 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdecore/klocale.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'kdecore/klocale.cpp') diff --git a/kdecore/klocale.cpp b/kdecore/klocale.cpp index f83ec6be1..91fe1c2a1 100644 --- a/kdecore/klocale.cpp +++ b/kdecore/klocale.cpp @@ -408,7 +408,11 @@ TQString KLocale::catalogueFileName(const TQString & language, .arg( language ) .arg( catalog.name() ); - return locate( "locale", path ); + TQString fileName = locate( "locale", path ); + if (fileName.isEmpty()) + fileName = locate( "locale-bundle", path ); + + return fileName; } bool KLocale::setLanguage(const TQString & language) @@ -507,6 +511,9 @@ bool KLocale::isApplicationTranslatedInto( const TQString & language) // kdDebug() << "isApplicationTranslatedInto: filename " << sFileName << endl; TQString sAbsFileName = locate( "locale", sFileName ); + if (sAbsFileName.isEmpty()) + sAbsFileName = locate( "locale-bundle", sFileName ); + // kdDebug() << "isApplicationTranslatedInto: absname " << sAbsFileName << endl; return ! sAbsFileName.isEmpty(); } -- cgit v1.2.1