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

Handle stand-alone weekday and month names in macOS date formats

Browse Source 
macOS returns "cccc" (stand-alone weekday name) as a part of the
preferred date+time format for Finnish, and possiblly others. This was
not handled at all by wxTranslateFromUnicodeFormat(), and the user
saw the raw "cccc".

Similarly, handle stand-alone month name ("LLLL").

Closes https://github.com/wxWidgets/wxWidgets/pull/518
This commit is contained in:
Lauri Nurmi
2017-07-15 19:08:21 +03:00
committed by VZ
parent 175c62d3f3
commit 05ced5ce01
1 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/common/intl.cpp
View File

@@ -1212,7 +1212,7 @@ wxString wxTranslateFromUnicodeFormat(const wxString& fmt)
#ifdef __WINDOWS__ #ifdef __WINDOWS__
"t" "t"
#else #else
"EawD" "EcLawD"
#endif #endif
; ;
for ( wxString::const_iterator p = fmt.begin(); /* end handled inside */; ++p ) for ( wxString::const_iterator p = fmt.begin(); /* end handled inside */; ++p )
@@ -1309,6 +1309,53 @@ wxString wxTranslateFromUnicodeFormat(const wxString& fmt)
wxFAIL_MSG( "wrong number of 'E's" ); wxFAIL_MSG( "wrong number of 'E's" );
} }
break; break;
case 'c':
switch ( lastCount )
{
case 1: // c
// TODO: unsupported: first day of week as numeric value
fmtWX += "1";
break;
case 3: // ccc
fmtWX += "%a";
break;
case 4: // cccc
fmtWX += "%A";
break;
case 5: // ccccc
// no "narrow form" in strftime(), use abbrev.
fmtWX += "%a";
break;
default:
wxFAIL_MSG( "wrong number of 'c's" );
}
break;
case 'L':
switch ( lastCount )
{
case 1: // L
case 2: // LL
fmtWX += "%m";
break;
case 3: // LLL
fmtWX += "%b";
break;
case 4: // LLLL
fmtWX += "%B";
break;
case 5: // LLLLL
// no "narrow form" in strftime(), use abbrev.
fmtWX += "%b";
break;
default:
wxFAIL_MSG( "too many 'L's" );
}
break;
#endif #endif
case 'M': case 'M':
switch ( lastCount ) switch ( lastCount )