ParseDate() understands tomorrow and yesterday as well as today
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
3ce65f6c9b
commit
fd9f9f4c4b
@ -2963,16 +2963,36 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
|
|||||||
while ( wxIsspace(*p) )
|
while ( wxIsspace(*p) )
|
||||||
p++;
|
p++;
|
||||||
|
|
||||||
wxString today = _T("today");
|
// some special cases
|
||||||
size_t len = today.length();
|
static struct
|
||||||
if ( wxString(p, len).CmpNoCase(today) == 0 )
|
|
||||||
{
|
{
|
||||||
// nothing can follow this, so stop here
|
const wxChar *str;
|
||||||
p += len;
|
int dayDiffFromToday;
|
||||||
|
} literalDates[] =
|
||||||
|
{
|
||||||
|
{ wxTRANSLATE("today"), 0 },
|
||||||
|
{ wxTRANSLATE("yesterday"), -1 },
|
||||||
|
{ wxTRANSLATE("tomorrow"), 1 },
|
||||||
|
};
|
||||||
|
|
||||||
*this = Today();
|
for ( size_t n = 0; n < WXSIZEOF(literalDates); n++ )
|
||||||
|
{
|
||||||
|
wxString date = wxGetTranslation(literalDates[n].str);
|
||||||
|
size_t len = date.length();
|
||||||
|
if ( wxString(p, len).CmpNoCase(date) == 0 )
|
||||||
|
{
|
||||||
|
// nothing can follow this, so stop here
|
||||||
|
p += len;
|
||||||
|
|
||||||
return p;
|
int dayDiffFromToday = literalDates[n].dayDiffFromToday;
|
||||||
|
*this = Today();
|
||||||
|
if ( dayDiffFromToday )
|
||||||
|
{
|
||||||
|
*this += wxDateSpan::Days(dayDiffFromToday);
|
||||||
|
}
|
||||||
|
|
||||||
|
return p;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// what do we have?
|
// what do we have?
|
||||||
|
Loading…
Reference in New Issue
Block a user