Add time zone parsing support for 'Z' (UTC indicator)

codereader · Jun 22, 2017 · a3a4e7c · a3a4e7c
1 parent 51cfb64
commit a3a4e7c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/common/datetimefmt.cpp b/src/common/datetimefmt.cpp
@@ -1482,6 +1482,14 @@ wxDateTime::ParseFormat(const wxString& date,
                     if ( input == end )
                         return false;
 
+                    if ( *input == wxS('Z') )
+                    {
+                        // Time is in UTC.
+                        ++input;
+                        haveTimeZone = true;
+                        break;
+                    }
+
                     // and then check that it's either plus or minus sign
                     bool minusFound;
                     if ( *input == wxT('-') )

diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp
@@ -903,6 +903,9 @@ void DateTimeTestCase::TestTimeZoneParse()
         { "13:37+0000", true },
         { "17:37+0400", true },
 
+        // Z as UTC designator.
+        { "13:37Z", true },
+
         // Some invalid ones too.
         { "00:00-1300" }, // Offset out of range.
         { "00:00+1300" }, // Offset out of range.