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

Add minus sign (U+2212) as a time zone offset indicator

Browse Source
This commit is contained in:
Dimitri Schoolwerth
2017-06-20 18:50:54 +04:00
committed by Dimitri Schoolwerth
parent 1a5163a882
commit af309e6d96
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/datetimefmt.cpp
View File

@@ -1497,12 +1497,19 @@ wxDateTime::ParseFormat(const wxString& date,
break; break;
} }
// and then check that it's either plus or minus sign // Check if there's either a plus, hyphen-minus, or
// minus sign.
bool minusFound; bool minusFound;
if ( *input == wxT('-') ) if ( *input == wxS('+') )
minusFound = true;
else if ( *input == wxT('+') )
minusFound = false; minusFound = false;
else if
(
*input == wxS('-')
#if wxUSE_UNICODE
|| *input == wxString::FromUTF8("\xe2\x88\x92")
#endif
)
minusFound = true;
else else
return false; // no match return false; // no match

7
tests/datetime/datetimetest.cpp
View File

@@ -918,6 +918,11 @@ void DateTimeTestCase::TestTimeZoneParse()
{ "09:07-04:30", true }, { "09:07-04:30", true },
{ "19:22+05:45", true }, { "19:22+05:45", true },
#if wxUSE_UNICODE
// Containing minus sign (U+2212) as separator between time and tz.
{ "09:37" "\xe2\x88\x92" "0400", true },
#endif
// Some invalid ones too. // Some invalid ones too.
{ "00:00-1300" }, // Offset out of range. { "00:00-1300" }, // Offset out of range.
@@ -937,7 +942,7 @@ void DateTimeTestCase::TestTimeZoneParse()
for ( size_t n = 0; n < WXSIZEOF(parseTestTimeZones); ++n ) for ( size_t n = 0; n < WXSIZEOF(parseTestTimeZones); ++n )
{ {
wxDateTime dt; wxDateTime dt;
wxString sTimeZone = parseTestTimeZones[n].str; wxString sTimeZone = wxString::FromUTF8(parseTestTimeZones[n].str);
wxString::const_iterator end; wxString::const_iterator end;
if ( dt.ParseFormat(sTimeZone, wxS("%H:%M%z"), &end) if ( dt.ParseFormat(sTimeZone, wxS("%H:%M%z"), &end)
&& end == sTimeZone.end() ) && end == sTimeZone.end() )