JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* lc_era.h (lc_era): Fix "ja_JP" era_t_fmt entry to use traditional

Browse Source 
format.
	* nlsfuncs.cc (dt_flags): Remove DT_ERACAL since crippled era data
	in Windows makes it useless.
	(__eval_datetimefmt): Check if locale's default calender has
	non-gregorian start year.  Use era year also in default date entries,
	if so.
This commit is contained in:
Corinna Vinschen
2010-02-20 22:10:26 +00:00
parent 53a918f3d6
commit 5d76584680
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
winsup/cygwin/nlsfuncs.cc
View File

@@ -351,9 +351,6 @@ enum dt_flags {
DT_DEFAULT = 0x00,
DT_AMPM = 0x01, /* Enforce 12 hour time format. */
DT_ABBREV = 0x02, /* Enforce abbreviated month and day names. */
DT_ERACAL = 0x04, /* Retrieve era information (ignored otherwise).
Also switch to optional calendar with era
information, if necessary. */
};
static char *
@@ -363,6 +360,7 @@ __eval_datetimefmt (LCID lcid, LCTYPE type, dt_flags flags, char **ptr,
wchar_t buf[80];
wchar_t fc;
size_t num;
DWORD cal;
mbstate_t mb;
size_t idx;
const char *day_str = "edaA";
@@ -402,6 +400,17 @@ __eval_datetimefmt (LCID lcid, LCTYPE type, dt_flags flags, char **ptr,
if ((flags & DT_ABBREV) && fc != L'y' && idx == 3)
idx = 2;
*p++ = '%';
/* Check for default calender with offset to gregorian calendar.
If so, make era representation the default. */
if (fc == L'y'
&& GetLocaleInfoW (lcid, LOCALE_ICALENDARTYPE
| LOCALE_RETURN_NUMBER,
(PWCHAR) &cal, sizeof cal / sizeof (WCHAR))
&& cal > CAL_GREGORIAN_US)
{
*p++ = 'E';
idx = 2;
}
*p++ = t_str[idx];
break;
case L'g':