// Return the localized date/time
if (useUTC) {
// Return UTC time
- return date.toUTC().toString(dateFormat);
+ if (dateFormat == Qt::DateFormat::ISODate) {
+ // Replace the "T" date/time separator with " " for readability. This isn't quite the
+ // ISO 8601 spec (it specifies omitting the "T" entirely), but RFC 3339 allows this.
+ // Go with RFC 3339 for human readability that's still machine-parseable, too.
+ //
+ // Before: 2018-06-21T21:35:52Z
+ // After: 2018-06-21 21:35:52Z
+ // ..........^ (10th character)
+ //
+ // See https://en.wikipedia.org/wiki/ISO_8601#cite_note-32
+ // And https://www.ietf.org/rfc/rfc3339.txt
+ return date.toUTC().toString(dateFormat).replace(10, 1, " ");
+ } else {
+ return date.toUTC().toString(dateFormat);
+ }
} else if (dateFormat == Qt::DateFormat::ISODate) {
// Add in ISO local timezone information via special handling below
+ // formatDateTimeToOffsetISO() handles converting "T" to " "
return formatDateTimeToOffsetISO(date);
} else {
// Return local time
return "formatDateTimeToISO() invalid date/time";
}
+ // Replace the "T" date/time separator with " " for readability. This isn't quite the ISO 8601
+ // spec (it specifies omitting the "T" entirely), but RFC 3339 allows this. Go with RFC 3339
+ // for human readability that's still machine-parseable, too.
+ //
+ // Before: 2018-08-22T18:43:10-05:00
+ // After: 2018-08-22 18:43:10-05:00
+ // ..........^ (10th character)
+ //
+ // See https://en.wikipedia.org/wiki/ISO_8601#cite_note-32
+ // And https://www.ietf.org/rfc/rfc3339.txt
+
#if 0
- // The expected way to get a UTC offset on ISO8601 dates
- return dateTime.toTimeSpec(Qt::OffsetFromUTC).toString(Qt::ISODate);
+ // The expected way to get a UTC offset on ISO 8601 dates
+ // Remove the "T" date/time separator
+ return dateTime.toTimeSpec(Qt::OffsetFromUTC).toString(Qt::ISODate).replace(10, 1, " ");
#else
// Work around Qt bug that converts to UTC instead of including timezone information
// See https://bugreports.qt.io/browse/QTBUG-26161
// Force the local time to follow this offset
local.setUtcOffset(utcOffset);
// Now the output should be correct
- return local.toString(Qt::ISODate);
+ // Remove the "T" date/time separator
+ return local.toString(Qt::ISODate).replace(10, 1, " ");
#endif
}