Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for better European date format parsing

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-01-08 16:48:59 +00:00
parent 93521c94f5
commit 6411a32c16
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/datetime.cpp
View File

@@ -3157,14 +3157,27 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
// it's a month // it's a month
if ( haveMon ) if ( haveMon )
{ {
break; // but we already have a month - maybe we guessed wrong?
if ( !haveDay )
{
// no need to check in month range as always < 12, but
// the days are counted from 1 unlike the months
day = (wxDateTime_t)mon + 1;
haveDay = TRUE;
}
else
{
// could possible be the year (doesn't the year come
// before the month in the japanese format?) (FIXME)
break;
}
} }
mon = mon2; mon = mon2;
haveMon = TRUE; haveMon = TRUE;
} }
else else // not a valid month name
{ {
wday = GetWeekDayFromName(token, Name_Full | Name_Abbr); wday = GetWeekDayFromName(token, Name_Full | Name_Abbr);
if ( wday != Inv_WeekDay ) if ( wday != Inv_WeekDay )
@@ -3177,7 +3190,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
haveWDay = TRUE; haveWDay = TRUE;
} }
else else // not a valid weekday name
{ {
// try the ordinals // try the ordinals
static const wxChar *ordinals[] = static const wxChar *ordinals[] =
@@ -3203,7 +3216,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
wxTRANSLATE("nineteenth"), wxTRANSLATE("nineteenth"),
wxTRANSLATE("twentieth"), wxTRANSLATE("twentieth"),
// that's enough - otherwise we'd have problems with // that's enough - otherwise we'd have problems with
// composite (or not) ordinals otherwise // composite (or not) ordinals
}; };
size_t n; size_t n;