Lines 94-99
struct locale_time_t
Link Here
|
94 |
const char *alt_mon[12]; |
94 |
const char *alt_mon[12]; |
95 |
const uint32_t *walt_mon[12]; |
95 |
const uint32_t *walt_mon[12]; |
96 |
int alt_mon_defined; |
96 |
int alt_mon_defined; |
|
|
97 |
const char *ab_alt_mon[12]; |
98 |
const uint32_t *wab_alt_mon[12]; |
99 |
int ab_alt_mon_defined; |
97 |
unsigned char week_ndays; |
100 |
unsigned char week_ndays; |
98 |
uint32_t week_1stday; |
101 |
uint32_t week_1stday; |
99 |
unsigned char week_1stweek; |
102 |
unsigned char week_1stweek; |
Lines 664-669
time_output (struct localedef_t *locale, const struct charmap_t *charmap,
Link Here
|
664 |
for (n = 0; n < 12; ++n) |
667 |
for (n = 0; n < 12; ++n) |
665 |
add_locale_wstring (&file, time->walt_mon[n] ?: empty_wstr); |
668 |
add_locale_wstring (&file, time->walt_mon[n] ?: empty_wstr); |
666 |
|
669 |
|
|
|
670 |
/* The ab'alt'mons. */ |
671 |
for (n = 0; n < 12; ++n) |
672 |
add_locale_string (&file, time->ab_alt_mon[n] ?: ""); |
673 |
|
674 |
/* The wide character ab'alt'mons. */ |
675 |
for (n = 0; n < 12; ++n) |
676 |
add_locale_wstring (&file, time->wab_alt_mon[n] ?: empty_wstr); |
677 |
|
667 |
write_locale_data (output_path, LC_TIME, "LC_TIME", &file); |
678 |
write_locale_data (output_path, LC_TIME, "LC_TIME", &file); |
668 |
} |
679 |
} |
669 |
|
680 |
|
Lines 808-813
time_read (struct linereader *ldfile, struct localedef_t *result,
Link Here
|
808 |
STRARR_ELEM (am_pm, 2, 2); |
819 |
STRARR_ELEM (am_pm, 2, 2); |
809 |
STRARR_ELEM (alt_digits, 0, 100); |
820 |
STRARR_ELEM (alt_digits, 0, 100); |
810 |
STRARR_ELEM (alt_mon, 12, 12); |
821 |
STRARR_ELEM (alt_mon, 12, 12); |
|
|
822 |
STRARR_ELEM (ab_alt_mon, 12, 12); |
811 |
|
823 |
|
812 |
case tok_era: |
824 |
case tok_era: |
813 |
/* Ignore the rest of the line if we don't need the input of |
825 |
/* Ignore the rest of the line if we don't need the input of |
Lines 968-973
time_read (struct linereader *ldfile, struct localedef_t *result,
Link Here
|
968 |
memcpy (time->walt_mon, time->wmon, sizeof (time->wmon)); |
980 |
memcpy (time->walt_mon, time->wmon, sizeof (time->wmon)); |
969 |
time->alt_mon_defined = 1; |
981 |
time->alt_mon_defined = 1; |
970 |
} |
982 |
} |
|
|
983 |
/* The same for abbreviated versions. */ |
984 |
if (!ignore_content && !time->ab_alt_mon_defined) |
985 |
{ |
986 |
memcpy (time->ab_alt_mon, time->abmon, sizeof (time->abmon)); |
987 |
memcpy (time->wab_alt_mon, time->wabmon, sizeof (time->wabmon)); |
988 |
time->ab_alt_mon_defined = 1; |
989 |
} |
971 |
return; |
990 |
return; |
972 |
|
991 |
|
973 |
default: |
992 |
default: |