solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Fix ParseDate() for dates having day expressed as an ordinal

Browse source 
Previously the year was left unparsed, and the current year was
incorrectly used even when the input provided a year.
This commit is contained in:
Lauri Nurmi 2022-03-18 19:39:22 +02:00 • committed by Vadim Zeitlin
parent 700d763ebc
commit 945738042d
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/common/datetimefmt.cpp
View file

@ -2033,9 +2033,9 @@ wxDateTime::ParseDate(const wxString& date, wxString::const_iterator *end)
{
const wxString ord = wxGetTranslation(ordinals[n]);
const size_t len = ord.length();
if ( date.compare(p - pBegin, len, ord) == 0 )
if ( date.compare(pCopy - pBegin, len, ord) == 0 )
{
p += len;
pCopy += len;
break;
}
}

1
tests/datetime/datetimetest.cpp
View file

@ -1249,6 +1249,7 @@ void DateTimeTestCase::TestDateParse()
{ "31/03/2006", { 31, wxDateTime::Mar, 2006 }, true, "" },
{ "Thu 20 Jun 2019", { 20, wxDateTime::Jun, 2019 }, true, "" },
{ "20 Jun 2019 Thu", { 20, wxDateTime::Jun, 2019 }, true, "" },
{ "Dec sixth 2017", { 6, wxDateTime::Dec, 2017 }, true, "" },
// valid, but followed by something
{ "Dec 31 1979 was the end of 70s",