X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Futil.cpp;h=4a9165a3f0fd69222ca1f8c864a4b26486776d9a;hp=914c9a49e9a7282e3b54a15cae13f051383dc63b;hb=3a3e844f9fcfd12235a0086af75ecd503b621ef4;hpb=4adaaaa83ad4f27fa6b9c902eddefcaee664dd32

diff --git a/src/common/util.cpp b/src/common/util.cpp
index 914c9a49..4a9165a3 100644
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -306,9 +306,24 @@ QString tryFormatUnixEpoch(const QString &possibleEpochDate, Qt::DateFormat date
     // 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
@@ -324,9 +339,21 @@ QString formatDateTimeToOffsetISO(const QDateTime &dateTime)
         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
@@ -348,6 +375,7 @@ QString formatDateTimeToOffsetISO(const QDateTime &dateTime)
     // 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
 }