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

adding more symbols to translation, using better matching formats

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-03-30 18:13:42 +00:00
parent 69e65b6c0b
commit 470298433c
1 changed files with 58 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/common/intl.cpp
View File

@@ -2618,6 +2618,8 @@ static wxString TranslateFromUnicodeFormat(const wxString& fmt)
"dghHmMsSy" "dghHmMsSy"
#ifdef __WXMSW__ #ifdef __WXMSW__
"t" "t"
#else
"EawD"
#endif #endif
; ;
for ( wxString::const_iterator p = fmt.begin(); /* end handled inside */; ++p ) for ( wxString::const_iterator p = fmt.begin(); /* end handled inside */; ++p )
@@ -2654,7 +2656,7 @@ static wxString TranslateFromUnicodeFormat(const wxString& fmt)
// between 1 and 2 digits for days // between 1 and 2 digits for days
fmtWX += "%d"; fmtWX += "%d";
break; break;
#ifdef __WXMSW__
case 3: // ddd case 3: // ddd
fmtWX += "%a"; fmtWX += "%a";
break; break;
@@ -2662,12 +2664,57 @@ static wxString TranslateFromUnicodeFormat(const wxString& fmt)
case 4: // dddd case 4: // dddd
fmtWX += "%A"; fmtWX += "%A";
break; break;
#endif
default: default:
wxFAIL_MSG( "too many 'd's" ); wxFAIL_MSG( "too many 'd's" );
} }
break; break;
#ifndef __WXMSW__
case 'D':
switch ( lastCount )
{
case 1: // D
case 2: // DD
case 3: // DDD
fmtWX += "%j";
break;
default:
wxFAIL_MSG( "wrong number of 'D's" );
}
break;
case 'w':
switch ( lastCount )
{
case 1: // w
case 2: // ww
fmtWX += "%W";
break;
default:
wxFAIL_MSG( "wrong number of 'w's" );
}
break;
case 'E':
switch ( lastCount )
{
case 1: // E
case 2: // EE
case 3: // EEE
fmtWX += "%a";
break;
case 4: // EEEE
fmtWX += "%A";
break;
case 5: // EEEEE
fmtWX += "%a";
break;
default:
wxFAIL_MSG( "wrong number of 'E's" );
}
break;
#endif
case 'M': case 'M':
switch ( lastCount ) switch ( lastCount )
{ {
@@ -2763,11 +2810,13 @@ static wxString TranslateFromUnicodeFormat(const wxString& fmt)
// strftime() doesn't have era string, // strftime() doesn't have era string,
// ignore this format // ignore this format
wxASSERT_MSG( lastCount <= 2, "too many 'g's" ); wxASSERT_MSG( lastCount <= 2, "too many 'g's" );
break;
break;
#ifndef __WXMSW__
case 'a': case 'a':
fmtWX += "%p"; fmtWX += "%p";
break; break;
#endif
#ifdef __WXMSW__ #ifdef __WXMSW__
case 't': case 't':
switch ( lastCount ) switch ( lastCount )
@@ -2940,13 +2989,13 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
switch (index ) switch (index )
{ {
case wxLOCALE_SHORT_DATE_FMT: case wxLOCALE_SHORT_DATE_FMT:
dateStyle = kCFDateFormatterMediumStyle; dateStyle = kCFDateFormatterShortStyle;
break; break;
case wxLOCALE_LONG_DATE_FMT: case wxLOCALE_LONG_DATE_FMT:
dateStyle = kCFDateFormatterLongStyle; dateStyle = kCFDateFormatterLongStyle;
break; break;
case wxLOCALE_DATE_TIME_FMT: case wxLOCALE_DATE_TIME_FMT:
dateStyle = kCFDateFormatterMediumStyle; dateStyle = kCFDateFormatterFullStyle;
timeStyle = kCFDateFormatterMediumStyle; timeStyle = kCFDateFormatterMediumStyle;
break; break;
case wxLOCALE_TIME_FMT: case wxLOCALE_TIME_FMT:
@@ -2959,7 +3008,10 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
wxCFRef<CFDateFormatterRef> dateFormatter( CFDateFormatterCreate wxCFRef<CFDateFormatterRef> dateFormatter( CFDateFormatterCreate
(NULL, userLocaleRef, dateStyle, timeStyle)); (NULL, userLocaleRef, dateStyle, timeStyle));
wxCFStringRef cfs = wxCFRetain( CFDateFormatterGetFormat(dateFormatter )); wxCFStringRef cfs = wxCFRetain( CFDateFormatterGetFormat(dateFormatter ));
return TranslateFromUnicodeFormat(cfs.AsString()); wxString format = TranslateFromUnicodeFormat(cfs.AsString());
// we always want full years
format.Replace("%y","%Y");
return format;
} }
break; break;