diff --git a/src/common/datetimefmt.cpp b/src/common/datetimefmt.cpp index 18249416d2..33fa84573a 100644 --- a/src/common/datetimefmt.cpp +++ b/src/common/datetimefmt.cpp @@ -1753,6 +1753,10 @@ wxDateTime::ParseDateTime(const wxString& date, wxString::const_iterator *end) while ( endDate != date.end() && wxIsspace(*endDate) ) ++endDate; + // Skip possible 'T' separator in front of time component + if ( endDate != date.end() && *endDate == 'T' ) + ++endDate; + const wxString timestr(endDate, date.end()); if ( !dtTime.ParseTime(timestr, &endTime) ) return false; diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp index e0e22353d9..3d4c735342 100644 --- a/tests/datetime/datetimetest.cpp +++ b/tests/datetime/datetimetest.cpp @@ -1440,6 +1440,15 @@ void DateTimeTestCase::TestDateTimeParse() false }, + { + // with 'T' separator + "2010-01-04T14:30", + { 4, wxDateTime::Jan, 2010, 14, 30, 0 }, + true, + "", + false + }, + { // date after time "14:30:00 2020-01-04",