Группа :: Графические оболочки/KDE
Пакет: kdelibs
Главная Изменения Спек Патчи Загрузить Bugs and FR
Патч: kdelibs-3.3.1-lang.patch
--- kdelibs-3.2.1/kdecore/klocale.cpp.orig 2004-10-11 14:09:25 +0400
+++ kdelibs-3.2.1/kdecore/klocale.cpp 2004-10-11 14:08:25 +0400
@@ -142,8 +142,6 @@ void KLocale::initLanguageList(KConfig *
languageList += QStringList::split
(':', QFile::decodeName( ::getenv("KDE_LANG") ));
- languageList += config->readListEntry("Language", ':');
-
// same order as setlocale use
if ( useEnv )
{
@@ -161,18 +159,27 @@ void KLocale::initLanguageList(KConfig *
QString ln, ct, chrset;
splitLocale(*it, ln, ct, chrset);
+ if ( *it == "C" || *it == "POSIX")
+ {
+ ln=defaultLanguage();
+ ct=QString::null;
+ chrset=QString::null;
+ }
+
if (!ct.isEmpty()) {
langs.insert(it, ln + '_' + ct);
- if (!chrset.isEmpty())
- langs.insert(it, ln + '_' + ct + '.' + chrset);
}
langs.insert(it, ln);
+ if (!chrset.isEmpty())
+ langs.insert(it, ln + '_' + ct + '.' + chrset);
}
languageList += langs;
}
+ languageList += config->readListEntry("Language", ':');
+
// now we have a language list -- let's use the first OK language
setLanguage( languageList );
}