whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QDateTime - Fix RFC 2822 Date Formatting 

The RFC 2822 date format should always use en_US locale for month and
day names instead of whatever the system locale is.  Also remove some
duplicate code.

Change-Id: Ia2f7ee405b4e0e2f04980301783b9488628da73f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
John Layt 2013-10-17 19:02:03 +02:00 committed by The Qt Project
parent 72544a5142
commit 93f5e0598a
2 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/corelib/tools/qdatetime.cpp
View File

@ -891,7 +891,7 @@ QString QDate::toString(Qt::DateFormat format) const
case Qt::DefaultLocaleLongDate:
return QLocale().toString(*this, QLocale::LongFormat);
case Qt::RFC2822Date:
return toString(QStringLiteral("dd MMM yyyy"));
return QLocale::c().toString(*this, QStringLiteral("dd MMM yyyy"));
default:
#ifndef QT_NO_TEXTDATE
case Qt::TextDate:
@ -1638,9 +1638,6 @@ QString QTime::toString(Qt::DateFormat format) const
case Qt::DefaultLocaleLongDate:
return QLocale().toString(*this, QLocale::LongFormat);
case Qt::RFC2822Date:
return QString::fromLatin1("%1:%2:%3").arg(hour(), 2, 10, QLatin1Char('0'))
.arg(minute(), 2, 10, QLatin1Char('0'))
.arg(second(), 2, 10, QLatin1Char('0'));
case Qt::ISODate:
case Qt::TextDate:
default:
@ -3548,27 +3545,8 @@ QString QDateTime::toString(Qt::DateFormat format) const
case Qt::DefaultLocaleLongDate:
return QLocale().toString(*this, QLocale::LongFormat);
case Qt::RFC2822Date: {
buf = toString(QStringLiteral("dd MMM yyyy hh:mm:ss "));
int utcOffset = d->m_offsetFromUtc;
if (timeSpec() == Qt::LocalTime) {
QDateTime utc = toUTC();
utc.setTimeSpec(timeSpec());
utcOffset = utc.secsTo(*this);
}
const int offset = qAbs(utcOffset);
buf += QLatin1Char((offset == utcOffset) ? '+' : '-');
const int hour = offset / 3600;
if (hour < 10)
buf += QLatin1Char('0');
buf += QString::number(hour);
const int min = (offset - (hour * 3600)) / 60;
if (min < 10)
buf += QLatin1Char('0');
buf += QString::number(min);
buf = QLocale::c().toString(*this, QStringLiteral("dd MMM yyyy hh:mm:ss "));
buf += toOffsetString(Qt::TextDate, d->m_offsetFromUtc);
return buf;
}
default:

4
tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
View File

@ -778,7 +778,11 @@ void tst_QDateTime::toString_rfcDate()
QFETCH(QDateTime, dt);
QFETCH(QString, formatted);
// Set to non-English locale to confirm still uses English
QLocale oldLocale;
QLocale::setDefault(QLocale("de_DE"));
QCOMPARE(dt.toString(Qt::RFC2822Date), formatted);
QLocale::setDefault(oldLocale);
}
void tst_QDateTime::toString_enumformat()