Группа :: Система/Библиотеки
Пакет: qt4
Главная Изменения Спек Патчи Загрузить Bugs and FR
Патч: qt-4.1.3-alt-honor-SUSv3-locales.patch
--- qt-x11-opensource-src-4.1.3/src/corelib/tools/qlocale.cpp~ 2006-05-14 14:46:59 +0400
+++ qt-x11-opensource-src-4.1.3/src/corelib/tools/qlocale.cpp 2006-05-22 15:13:46 +0400
@@ -1063,6 +1063,8 @@ static QByteArray envVarLocale()
#ifdef Q_OS_UNIX
lang = qgetenv("LC_ALL");
if (lang.isNull())
+ lang = qgetenv("LC_MESSAGES");
+ if (lang.isNull())
lang = qgetenv("LC_NUMERIC");
if (lang.isNull())
#endif
--- qt-x11-opensource-src-4.1.3/src/corelib/codecs/qtextcodec.cpp~ 2006-05-14 14:46:59 +0400
+++ qt-x11-opensource-src-4.1.3/src/corelib/codecs/qtextcodec.cpp 2006-05-22 15:06:13 +0400
@@ -361,11 +361,11 @@ static void setupLocaleMapper()
// Get the first nonempty value from $LC_ALL, $LC_CTYPE, and $LANG
// environment variables.
char * lang = qstrdup(qgetenv("LC_ALL").constData());
- if (!lang || lang[0] == 0 || strcmp(lang, "C") == 0) {
+ if (!lang || lang[0] == 0) {
if (lang) delete [] lang;
lang = qstrdup(qgetenv("LC_CTYPE").constData());
}
- if (!lang || lang[0] == 0 || strcmp(lang, "C") == 0) {
+ if (!lang || lang[0] == 0) {
if (lang) delete [] lang;
lang = qstrdup(qgetenv("LANG").constData());
}