diff options
| author | Matt Vogt <matthew.vogt@jollamobile.com> | 2016-03-03 19:03:30 +1000 |
|---|---|---|
| committer | Pekka Vuorela <pvuorela@iki.fi> | 2018-09-13 07:37:36 +0000 |
| commit | d4b86a15d07f031a626286047ecec53777cb4eb6 (patch) | |
| tree | 97db596e7843ffe15f301281b2e101db25d4fdd7 | |
| parent | c68ebe151653dabf207f2ec9681449ad812a34f6 (diff) | |
Ensure timestamps use C locale
Timestamps must be generated using the C locale, so they do not contain
digits other than Latin.
Change-Id: Ie35111a4c67979b70ed9b5fd5dfd1393e1b34c2e
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
| -rw-r--r-- | src/libraries/qmfclient/qmailtimestamp.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libraries/qmfclient/qmailtimestamp.cpp b/src/libraries/qmfclient/qmailtimestamp.cpp index d7913a1e..a937f151 100644 --- a/src/libraries/qmfclient/qmailtimestamp.cpp +++ b/src/libraries/qmfclient/qmailtimestamp.cpp @@ -34,6 +34,7 @@ #include "qmailtimestamp.h" #include <QDate> +#include <QLocale> #include <QStringList> #include <QTime> @@ -254,12 +255,12 @@ QString QMailTimeStampPrivate::toString(QMailTimeStamp::OutputFormat format) con int mOffset = ( abs(utcOffset) - abs(hOffset * 3600) ) / 60; if (format == QMailTimeStamp::Rfc2822) { - result = QString(originalTime.toString(QLatin1String("%1, d %2 yyyy hh:mm:ss %3"))); + result = QLocale::c().toString(originalTime, QLatin1String("%1, d %2 yyyy hh:mm:ss %3")); result = result.arg( QString::fromLatin1( Days + ( originalDate.dayOfWeek() - 1 ) * 3, 3 ) ); result = result.arg( QString::fromLatin1( Months + ( originalDate.month() - 1 ) * 3, 3 ) ); result = result.arg( QString().sprintf( "%+.2d%.2d", hOffset, mOffset ) ); } else if (format == QMailTimeStamp::Rfc3501) { - result = QString(originalTime.toString(QLatin1String("dd-%1-yyyy hh:mm:ss %2"))); + result = QLocale::c().toString(originalTime, QLatin1String("dd-%1-yyyy hh:mm:ss %2")); result = result.arg( QString::fromLatin1( Months + ( originalDate.month() - 1 ) * 3, 3 ) ); result = result.arg( QString().sprintf( "%+.2d%.2d", hOffset, mOffset ) ); @@ -268,7 +269,7 @@ QString QMailTimeStampPrivate::toString(QMailTimeStamp::OutputFormat format) con result[0] = QChar::fromLatin1(' '); } } else if (format == QMailTimeStamp::Rfc3339) { - result = QString(originalTime.toString(QLatin1String("yyyy-MM-ddThh:mm:ss%1"))); + result = QLocale::c().toString(originalTime, QLatin1String("yyyy-MM-ddThh:mm:ss%1")); result = result.arg(utcOffset == 0 ? QLatin1String("Z") : QString().sprintf("%+.2d:%.2d", hOffset, mOffset)); } |