This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.26.9000-1144-g2aa8009
- From: rl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 22 Jan 2018 10:32:10 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.26.9000-1144-g2aa8009
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 2aa8009d21802f700c4b47cb8e0c7e71fe915ba2 (commit)
via 22390764f9ef3b04ae71ad100af6282f677315c2 (commit)
via 761a585ce9245d5ad968303b200eef1f26fd501c (commit)
via 95cb863a1ef7760a11272bbd7ba5fe62dc41be54 (commit)
from 4612268a0ad8e3409d8ce2314dd2dd8ee0af5269 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=2aa8009d21802f700c4b47cb8e0c7e71fe915ba2
commit 2aa8009d21802f700c4b47cb8e0c7e71fe915ba2
Author: Rafal Luzynski <digitalfreak@lingonborough.com>
Date: Tue Jan 5 03:03:10 2016 +0100
pl_PL: Add alternative month names (bug 10871).
[BZ #10871]
* localedata/locales/pl_PL: Alternative month names added,
primary month names are genitive now.
* time/tst-strptime.c (day_tests): Actually use a genitive case
of a month name in Polish language.
diff --git a/localedata/locales/pl_PL b/localedata/locales/pl_PL
index 2a8d09d..632a1b3 100644
--- a/localedata/locales/pl_PL
+++ b/localedata/locales/pl_PL
@@ -175,7 +175,7 @@ abmon "sty";"lut";/
"lip";"sie";/
"wrz";"pa<U017A>";/
"lis";"gru"
-mon "stycze<U0144>";/
+alt_mon "stycze<U0144>";/
"luty";/
"marzec";/
"kwiecie<U0144>";/
@@ -187,6 +187,18 @@ mon "stycze<U0144>";/
"pa<U017A>dziernik";/
"listopad";/
"grudzie<U0144>"
+mon "stycznia";/
+ "lutego";/
+ "marca";/
+ "kwietnia";/
+ "maja";/
+ "czerwca";/
+ "lipca";/
+ "sierpnia";/
+ "wrze<U015B>nia";/
+ "pa<U017A>dziernika";/
+ "listopada";/
+ "grudnia"
d_t_fmt "%a, %-d %b %Y, %T"
d_fmt "%d.%m.%Y"
t_fmt "%T"
diff --git a/time/tst-strptime.c b/time/tst-strptime.c
index 2eac5a2..49dfbe9 100644
--- a/time/tst-strptime.c
+++ b/time/tst-strptime.c
@@ -60,8 +60,7 @@ static const struct
/* Some languages do need the declension of the month names. */
{ "pl_PL.UTF-8", "21 lis 2017", "%d %b %Y", 2, 324, 10, 21 },
{ "pl_PL.UTF-8", "22 LIS 2017", "%d %B %Y", 3, 325, 10, 22 },
- /* TODO: Use the genitive case here as soon as it is added to localedata. */
- { "pl_PL.UTF-8", "23 listopad 2017", "%d %B %Y", 4, 326, 10, 23 },
+ { "pl_PL.UTF-8", "23 listopada 2017", "%d %B %Y", 4, 326, 10, 23 },
/* The nominative case is incorrect here but it is parseable. */
{ "pl_PL.UTF-8", "24 listopad 2017", "%d %OB %Y", 5, 327, 10, 24 },
{ "pl_PL.UTF-8", "25 lis 2017", "%d %Ob %Y", 6, 328, 10, 25 },
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=22390764f9ef3b04ae71ad100af6282f677315c2
commit 22390764f9ef3b04ae71ad100af6282f677315c2
Author: Rafal Luzynski <digitalfreak@lingonborough.com>
Date: Tue Sep 19 00:00:22 2017 +0200
Documentation to the above changes (bug 10871).
[BZ #10871]
* manual/locale.texi: Document ALTMON_1..12 constants for
nl_langinfo. Specify when to use ALTMON instead of MON.
* manual/time.texi (strftime, strptime): Document GNU extension
permitting O modifier with %B and %b. Specify when to use
%OB instead of %B.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
diff --git a/ChangeLog b/ChangeLog
index ab15b59..7b518b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
2018-01-22 Rafal Luzynski <digitalfreak@lingonborough.com>
[BZ #10871]
+ * manual/locale.texi: Document ALTMON_1..12 constants for
+ nl_langinfo. Specify when to use ALTMON instead of MON.
+ * manual/time.texi (strftime, strptime): Document GNU extension
+ permitting O modifier with %B and %b. Specify when to use
+ %OB instead of %B.
+
+2018-01-22 Rafal Luzynski <digitalfreak@lingonborough.com>
+
+ [BZ #10871]
* locale/C-time.c (_nl_C_LC_TIME): Add abbreviated alternative month
names, define them as the same as abbreviated month names explicitly.
* locale/categories.def (LC_TIME): Add ab_alt_mon and wide-ab_alt_mon.
diff --git a/NEWS b/NEWS
index 79736db..dd8b795 100644
--- a/NEWS
+++ b/NEWS
@@ -69,6 +69,30 @@ Major new features:
collation ordering. Previous glibc versions used locale-specific
ordering, the change might break systems that relied on that.
+* Support for two grammatical forms of month names has been added.
+ In a call to strftime, the "%B" and "%b" format specifiers will now
+ produce the grammatical form required when the month is used as part
+ of a complete date. New "%OB" and "%Ob" specifiers produce the form
+ required when the month is named by itself. For instance, in Greek
+ and in many Slavic and Baltic languages, "%B" will produce the month
+ in genitive case, and "%OB" will produce the month in nominative case.
+
+ In a call to strptime, "%B", "%b", "%h", "%OB", "%Ob", and "%Oh"
+ are all valid and will all accept any known form of month
+ name---standalone or complete, abbreviated or full. In a call to
+ nl_langinfo, the query constants MON_1..12 and ABMON_1..12 return
+ the strings used by "%B" and "%b", respectively. New query
+ constants ALTMON_1..12 and _NL_ABALTMON_1..12 return the strings
+ used by "%OB" and "%Ob", respectively.
+
+ In a locale definition file, use "alt_mon" and "ab_alt_mon" to
+ define the strings for %OB and %Ob, respectively; these have the
+ same syntax as "mon" and "ab_mon".
+
+ This feature is currently a GNU extension, but it is expected to
+ be added to the next revision of POSIX, and it is also already
+ available on some BSD-derived operating systems.
+
Deprecated and removed features, and other changes affecting compatibility:
* Support for statically linked applications which call dlopen is deprecated
diff --git a/manual/locale.texi b/manual/locale.texi
index 60ad2a1..059db75 100644
--- a/manual/locale.texi
+++ b/manual/locale.texi
@@ -923,7 +923,7 @@ corresponds to Sunday.
@itemx DAY_5
@itemx DAY_6
@itemx DAY_7
-Similar to @code{ABDAY_1} etc., but here the return value is the
+Similar to @code{ABDAY_1} etc.,@: but here the return value is the
unabbreviated weekday name.
@item ABMON_1
@itemx ABMON_2
@@ -937,7 +937,8 @@ unabbreviated weekday name.
@itemx ABMON_10
@itemx ABMON_11
@itemx ABMON_12
-The return value is abbreviated name of the month. @code{ABMON_1}
+The return value is the abbreviated name of the month, in the grammatical
+form used when the month forms part of a complete date. @code{ABMON_1}
corresponds to January.
@item MON_1
@itemx MON_2
@@ -951,8 +952,27 @@ corresponds to January.
@itemx MON_10
@itemx MON_11
@itemx MON_12
-Similar to @code{ABMON_1} etc., but here the month names are not abbreviated.
+Similar to @code{ABMON_1} etc.,@: but here the month names are not abbreviated.
Here the first value @code{MON_1} also corresponds to January.
+@item ALTMON_1
+@itemx ALTMON_2
+@itemx ALTMON_3
+@itemx ALTMON_4
+@itemx ALTMON_5
+@itemx ALTMON_6
+@itemx ALTMON_7
+@itemx ALTMON_8
+@itemx ALTMON_9
+@itemx ALTMON_10
+@itemx ALTMON_11
+@itemx ALTMON_12
+Similar to @code{MON_1} etc.,@: but here the month names are in the grammatical
+form used when the month is named by itself. The @code{strftime} functions
+use these month names for the format specifier @code{OB}.
+
+Note that not all languages need two different forms of the month names,
+so the strings returned for @code{MON_@dots{}} and @code{ALTMON_@dots{}}
+may or may not be the same, depending on the locale.
@item AM_STR
@itemx PM_STR
The return values are strings which can be used in the representation of time
diff --git a/manual/time.texi b/manual/time.texi
index 33aa221..2a5afd9 100644
--- a/manual/time.texi
+++ b/manual/time.texi
@@ -1346,8 +1346,13 @@ example, @code{%Ex} might yield a date format based on the Japanese
Emperors' reigns.
@item O
-Use the locale's alternate numeric symbols for numbers. This modifier
-applies only to numeric format specifiers.
+With all format specifiers that produce numbers: use the locale's
+alternate numeric symbols.
+
+With @code{%B} and @code{%b}: use the grammatical form for month names
+that is appropriate when the month is named by itself, rather than
+the form that is appropriate when the month is used as part of a
+complete date. This is a GNU extension.
@end table
If the format supports the modifier but no alternate representation
@@ -1365,13 +1370,21 @@ The abbreviated weekday name according to the current locale.
The full weekday name according to the current locale.
@item %b
-The abbreviated month name according to the current locale.
+The abbreviated month name according to the current locale, in the
+grammatical form used when the month is part of a complete date.
+As a GNU extension, the @code{O} modifier can be used (@code{%Ob})
+to get the grammatical form used when the month is named by itself.
@item %B
-The full month name according to the current locale.
+The full month name according to the current locale, in the
+grammatical form used when the month is part of a complete date.
+As a GNU extension, the @code{O} modifier can be used (@code{%OB})
+to get the grammatical form used when the month is named by itself.
-Using @code{%B} together with @code{%d} produces grammatically
-incorrect results for some locales.
+Note that not all languages need two different forms of the month
+names, so the text produced by @code{%B} and @code{%OB}, and by
+@code{%b} and @code{%Ob}, may or may not be the same, depending on
+the locale.
@item %c
The preferred calendar time representation for the current locale.
@@ -1778,8 +1791,14 @@ the full name.
@item %b
@itemx %B
@itemx %h
-The month name according to the current locale, in abbreviated form or
-the full name.
+A month name according to the current locale. All three specifiers
+will recognize both abbreviated and full month names. If the
+locale provides two different grammatical forms of month names,
+all three specifiers will recognize both forms.
+
+As a GNU extension, the @code{O} modifier can be used with these
+specifiers; it has no effect, as both grammatical forms of month
+names are recognized.
@item %c
The date and time representation for the current locale.
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=761a585ce9245d5ad968303b200eef1f26fd501c
commit 761a585ce9245d5ad968303b200eef1f26fd501c
Author: Rafal Luzynski <digitalfreak@lingonborough.com>
Date: Tue Nov 14 02:22:38 2017 +0100
Abbreviated alternative month names (%Ob) also added (bug 10871).
All the previous changes also repeated to support abbreviated
alternative month names. In most languages which have declension and
need nominative/genitive month names the abbreviated forms for both
cases are the same. An example where they do differ is May in Russian:
this name is too short to be abbreviated so even the abbreviated form
features the declension suffixes.
[BZ #10871]
* locale/C-time.c (_nl_C_LC_TIME): Add abbreviated alternative month
names, define them as the same as abbreviated month names explicitly.
* locale/categories.def (LC_TIME): Add ab_alt_mon and wide-ab_alt_mon.
* locale/langinfo.h: (_NL_ABALTMON_1, _NL_ABALTMON_2, _NL_ABALTMON_3,
_NL_ABALTMON_4, _NL_ABALTMON_5, _NL_ABALTMON_6, _NL_ABALTMON_7,
_NL_ABALTMON_8, _NL_ABALTMON_9, _NL_ABALTMON_10, _NL_ABALTMON_11,
_NL_ABALTMON_12, _NL_WABALTMON_1, _NL_WABALTMON_2, _NL_WABALTMON_3,
_NL_WABALTMON_4, _NL_WABALTMON_5, _NL_WABALTMON_6, _NL_WABALTMON_7,
_NL_WABALTMON_8, _NL_WABALTMON_9, _NL_WABALTMON_10, _NL_WABALTMON_11,
_NL_WABALTMON_12): New enum constants.
* locale/programs/ld-time.c (struct locale_time_t): Add ab_alt_mon,
wab_alt_mon, and ab_alt_mon_defined members.
(time_output): Output ab_alt_mon and wab_alt_mon members.
(time_read): Read them, initialize them as copies of abmon and wabmon
respectively if they are missing, initialize ab_alt_mon_defined.
* locale/programs/locfile-kw.gperf (ab_alt_mon): Define.
* locale/programs/locfile-kw.h: Regenerate.
* locale/programs/locfile-token.h (tok_ab_alt_mon): New enum constant.
* time/Makefile [$(run-built-tests) = yes] (LOCALES): Add es_ES.UTF-8
and ru_RU.UTF-8.
* time/strftime_l.c (a_altmonth, aam_len): New macros.
[!COMPILE_WIDE] (ABALTMON_1): New macro.
(__strftime_internal): Handle %Ob and %Oh formats.
* time/strptime_l.c [_LIBC] (ab_alt_month_name): New macro.
(__strptime_internal): Handle %Ob and %Oh formats.
* time/tst-strptime.c (day_tests): Add more tests to parse different
forms of month names including the new %Ob format specifier.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
diff --git a/ChangeLog b/ChangeLog
index 8c333bb..ab15b59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,37 @@
2018-01-22 Rafal Luzynski <digitalfreak@lingonborough.com>
[BZ #10871]
+ * locale/C-time.c (_nl_C_LC_TIME): Add abbreviated alternative month
+ names, define them as the same as abbreviated month names explicitly.
+ * locale/categories.def (LC_TIME): Add ab_alt_mon and wide-ab_alt_mon.
+ * locale/langinfo.h: (_NL_ABALTMON_1, _NL_ABALTMON_2, _NL_ABALTMON_3,
+ _NL_ABALTMON_4, _NL_ABALTMON_5, _NL_ABALTMON_6, _NL_ABALTMON_7,
+ _NL_ABALTMON_8, _NL_ABALTMON_9, _NL_ABALTMON_10, _NL_ABALTMON_11,
+ _NL_ABALTMON_12, _NL_WABALTMON_1, _NL_WABALTMON_2, _NL_WABALTMON_3,
+ _NL_WABALTMON_4, _NL_WABALTMON_5, _NL_WABALTMON_6, _NL_WABALTMON_7,
+ _NL_WABALTMON_8, _NL_WABALTMON_9, _NL_WABALTMON_10, _NL_WABALTMON_11,
+ _NL_WABALTMON_12): New enum constants.
+ * locale/programs/ld-time.c (struct locale_time_t): Add ab_alt_mon,
+ wab_alt_mon, and ab_alt_mon_defined members.
+ (time_output): Output ab_alt_mon and wab_alt_mon members.
+ (time_read): Read them, initialize them as copies of abmon and wabmon
+ respectively if they are missing, initialize ab_alt_mon_defined.
+ * locale/programs/locfile-kw.gperf (ab_alt_mon): Define.
+ * locale/programs/locfile-kw.h: Regenerate.
+ * locale/programs/locfile-token.h (tok_ab_alt_mon): New enum constant.
+ * time/Makefile [$(run-built-tests) = yes] (LOCALES): Add es_ES.UTF-8
+ and ru_RU.UTF-8.
+ * time/strftime_l.c (a_altmonth, aam_len): New macros.
+ [!COMPILE_WIDE] (ABALTMON_1): New macro.
+ (__strftime_internal): Handle %Ob and %Oh formats.
+ * time/strptime_l.c [_LIBC] (ab_alt_month_name): New macro.
+ (__strptime_internal): Handle %Ob and %Oh formats.
+ * time/tst-strptime.c (day_tests): Add more tests to parse different
+ forms of month names including the new %Ob format specifier.
+
+2018-01-22 Rafal Luzynski <digitalfreak@lingonborough.com>
+
+ [BZ #10871]
* locale/C-time.c (_nl_C_LC_TIME): Add alternative month names,
define them as the same as primary full month names explicitly.
* locale/categories.def (LC_TIME): Add alt_mon and wide-alt_mon.
diff --git a/locale/C-time.c b/locale/C-time.c
index 73bc700..e2b3b17 100644
--- a/locale/C-time.c
+++ b/locale/C-time.c
@@ -30,7 +30,7 @@ const struct __locale_data _nl_C_LC_TIME attribute_hidden =
{ NULL, }, /* no cached data */
UNDELETABLE,
0,
- 135,
+ 159,
{
{ .string = "Sun" },
{ .string = "Mon" },
@@ -166,6 +166,30 @@ const struct __locale_data _nl_C_LC_TIME attribute_hidden =
{ .wstr = (const uint32_t *) L"September" },
{ .wstr = (const uint32_t *) L"October" },
{ .wstr = (const uint32_t *) L"November" },
- { .wstr = (const uint32_t *) L"December" }
+ { .wstr = (const uint32_t *) L"December" },
+ { .string = "Jan" },
+ { .string = "Feb" },
+ { .string = "Mar" },
+ { .string = "Apr" },
+ { .string = "May" },
+ { .string = "Jun" },
+ { .string = "Jul" },
+ { .string = "Aug" },
+ { .string = "Sep" },
+ { .string = "Oct" },
+ { .string = "Nov" },
+ { .string = "Dec" },
+ { .wstr = (const uint32_t *) L"Jan" },
+ { .wstr = (const uint32_t *) L"Feb" },
+ { .wstr = (const uint32_t *) L"Mar" },
+ { .wstr = (const uint32_t *) L"Apr" },
+ { .wstr = (const uint32_t *) L"May" },
+ { .wstr = (const uint32_t *) L"Jun" },
+ { .wstr = (const uint32_t *) L"Jul" },
+ { .wstr = (const uint32_t *) L"Aug" },
+ { .wstr = (const uint32_t *) L"Sep" },
+ { .wstr = (const uint32_t *) L"Oct" },
+ { .wstr = (const uint32_t *) L"Nov" },
+ { .wstr = (const uint32_t *) L"Dec" }
}
};
diff --git a/locale/categories.def b/locale/categories.def
index 3cbb4e6..56c5f88 100644
--- a/locale/categories.def
+++ b/locale/categories.def
@@ -249,8 +249,10 @@ DEFINE_CATEGORY
DEFINE_ELEMENT (_DATE_FMT, "date_fmt", opt, string)
DEFINE_ELEMENT (_NL_W_DATE_FMT, "wide-date_fmt", opt, wstring)
DEFINE_ELEMENT (_NL_TIME_CODESET, "time-codeset", std, string)
- DEFINE_ELEMENT (ALTMON_1, "alt_mon", opt, stringarray, 12, 12)
- DEFINE_ELEMENT (_NL_WALTMON_1, "wide-alt_mon", opt, wstringarray, 12, 12)
+ DEFINE_ELEMENT (ALTMON_1, "alt_mon", opt, stringarray, 12, 12)
+ DEFINE_ELEMENT (_NL_WALTMON_1, "wide-alt_mon", opt, wstringarray, 12, 12)
+ DEFINE_ELEMENT (_NL_ABALTMON_1, "ab_alt_mon", opt, stringarray, 12, 12)
+ DEFINE_ELEMENT (_NL_WABALTMON_1, "wide-ab_alt_mon", opt, wstringarray, 12, 12)
), NO_POSTLOAD)
diff --git a/locale/langinfo.h b/locale/langinfo.h
index 65374dd..a50cc9b 100644
--- a/locale/langinfo.h
+++ b/locale/langinfo.h
@@ -74,7 +74,8 @@ enum
DAY_7, /* Saturday */
#define DAY_7 DAY_7
- /* Abbreviated month names. */
+ /* Abbreviated month names, in the grammatical form used when the month
+ is a part of a complete date. */
ABMON_1, /* Jan */
#define ABMON_1 ABMON_1
ABMON_2,
@@ -176,7 +177,8 @@ enum
_NL_WDAY_6, /* Friday */
_NL_WDAY_7, /* Saturday */
- /* Abbreviated month names. */
+ /* Abbreviated month names, in the grammatical form used when the month
+ is a part of a complete date. */
_NL_WABMON_1, /* Jan */
_NL_WABMON_2,
_NL_WABMON_3,
@@ -277,6 +279,36 @@ enum
_NL_WALTMON_11,
_NL_WALTMON_12,
+ /* Abbreviated month names, in the grammatical form used when the month
+ is named by itself. */
+ _NL_ABALTMON_1, /* Jan */
+ _NL_ABALTMON_2,
+ _NL_ABALTMON_3,
+ _NL_ABALTMON_4,
+ _NL_ABALTMON_5,
+ _NL_ABALTMON_6,
+ _NL_ABALTMON_7,
+ _NL_ABALTMON_8,
+ _NL_ABALTMON_9,
+ _NL_ABALTMON_10,
+ _NL_ABALTMON_11,
+ _NL_ABALTMON_12,
+
+ /* Abbreviated month names, in the grammatical form used when the month
+ is named by itself. */
+ _NL_WABALTMON_1, /* Jan */
+ _NL_WABALTMON_2,
+ _NL_WABALTMON_3,
+ _NL_WABALTMON_4,
+ _NL_WABALTMON_5,
+ _NL_WABALTMON_6,
+ _NL_WABALTMON_7,
+ _NL_WABALTMON_8,
+ _NL_WABALTMON_9,
+ _NL_WABALTMON_10,
+ _NL_WABALTMON_11,
+ _NL_WABALTMON_12,
+
_NL_NUM_LC_TIME, /* Number of indices in LC_TIME category. */
/* LC_COLLATE category: text sorting.
diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c
index 4186448..a755792 100644
--- a/locale/programs/ld-time.c
+++ b/locale/programs/ld-time.c
@@ -94,6 +94,9 @@ struct locale_time_t
const char *alt_mon[12];
const uint32_t *walt_mon[12];
int alt_mon_defined;
+ const char *ab_alt_mon[12];
+ const uint32_t *wab_alt_mon[12];
+ int ab_alt_mon_defined;
unsigned char week_ndays;
uint32_t week_1stday;
unsigned char week_1stweek;
@@ -651,6 +654,14 @@ time_output (struct localedef_t *locale, const struct charmap_t *charmap,
for (n = 0; n < 12; ++n)
add_locale_wstring (&file, time->walt_mon[n] ?: empty_wstr);
+ /* The ab'alt'mons. */
+ for (n = 0; n < 12; ++n)
+ add_locale_string (&file, time->ab_alt_mon[n] ?: "");
+
+ /* The wide character ab'alt'mons. */
+ for (n = 0; n < 12; ++n)
+ add_locale_wstring (&file, time->wab_alt_mon[n] ?: empty_wstr);
+
write_locale_data (output_path, LC_TIME, "LC_TIME", &file);
}
@@ -795,6 +806,7 @@ time_read (struct linereader *ldfile, struct localedef_t *result,
STRARR_ELEM (am_pm, 2, 2);
STRARR_ELEM (alt_digits, 0, 100);
STRARR_ELEM (alt_mon, 12, 12);
+ STRARR_ELEM (ab_alt_mon, 12, 12);
case tok_era:
/* Ignore the rest of the line if we don't need the input of
@@ -955,6 +967,13 @@ time_read (struct linereader *ldfile, struct localedef_t *result,
memcpy (time->walt_mon, time->wmon, sizeof (time->wmon));
time->alt_mon_defined = 1;
}
+ /* The same for abbreviated versions. */
+ if (!ignore_content && !time->ab_alt_mon_defined)
+ {
+ memcpy (time->ab_alt_mon, time->abmon, sizeof (time->abmon));
+ memcpy (time->wab_alt_mon, time->wabmon, sizeof (time->wabmon));
+ time->ab_alt_mon_defined = 1;
+ }
return;
default:
diff --git a/locale/programs/locfile-kw.gperf b/locale/programs/locfile-kw.gperf
index dad7f21..6bf2f60 100644
--- a/locale/programs/locfile-kw.gperf
+++ b/locale/programs/locfile-kw.gperf
@@ -149,6 +149,7 @@ cal_direction, tok_cal_direction, 0
timezone, tok_timezone, 0
date_fmt, tok_date_fmt, 0
alt_mon, tok_alt_mon, 0
+ab_alt_mon, tok_ab_alt_mon, 0
LC_MESSAGES, tok_lc_messages, 0
yesexpr, tok_yesexpr, 0
noexpr, tok_noexpr, 0
diff --git a/locale/programs/locfile-kw.h b/locale/programs/locfile-kw.h
index 10d9d9a..d25cf99 100644
--- a/locale/programs/locfile-kw.h
+++ b/locale/programs/locfile-kw.h
@@ -54,7 +54,7 @@
#line 24 "locfile-kw.gperf"
struct keyword_t ;
-#define TOTAL_KEYWORDS 177
+#define TOTAL_KEYWORDS 178
#define MIN_WORD_LENGTH 3
#define MAX_WORD_LENGTH 22
#define MIN_HASH_VALUE 3
@@ -147,22 +147,22 @@ locfile_hash (register const char *str, register unsigned int len)
#line 30 "locfile-kw.gperf"
{"LC_CTYPE", tok_lc_ctype, 0},
{""},
-#line 167 "locfile-kw.gperf"
+#line 168 "locfile-kw.gperf"
{"LC_ADDRESS", tok_lc_address, 0},
-#line 152 "locfile-kw.gperf"
+#line 153 "locfile-kw.gperf"
{"LC_MESSAGES", tok_lc_messages, 0},
-#line 160 "locfile-kw.gperf"
+#line 161 "locfile-kw.gperf"
{"LC_NAME", tok_lc_name, 0},
-#line 157 "locfile-kw.gperf"
+#line 158 "locfile-kw.gperf"
{"LC_PAPER", tok_lc_paper, 0},
-#line 185 "locfile-kw.gperf"
+#line 186 "locfile-kw.gperf"
{"LC_MEASUREMENT", tok_lc_measurement, 0},
#line 56 "locfile-kw.gperf"
{"LC_COLLATE", tok_lc_collate, 0},
{""},
-#line 187 "locfile-kw.gperf"
+#line 188 "locfile-kw.gperf"
{"LC_IDENTIFICATION", tok_lc_identification, 0},
-#line 200 "locfile-kw.gperf"
+#line 201 "locfile-kw.gperf"
{"revision", tok_revision, 0},
#line 69 "locfile-kw.gperf"
{"UNDEFINED", tok_undefined, 0},
@@ -170,19 +170,19 @@ locfile_hash (register const char *str, register unsigned int len)
{"LC_NUMERIC", tok_lc_numeric, 0},
#line 82 "locfile-kw.gperf"
{"LC_MONETARY", tok_lc_monetary, 0},
-#line 180 "locfile-kw.gperf"
+#line 181 "locfile-kw.gperf"
{"LC_TELEPHONE", tok_lc_telephone, 0},
{""}, {""}, {""},
#line 75 "locfile-kw.gperf"
{"define", tok_define, 0},
-#line 153 "locfile-kw.gperf"
+#line 154 "locfile-kw.gperf"
{"yesexpr", tok_yesexpr, 0},
#line 141 "locfile-kw.gperf"
{"era_year", tok_era_year, 0},
{""},
#line 54 "locfile-kw.gperf"
{"translit_ignore", tok_translit_ignore, 0},
-#line 155 "locfile-kw.gperf"
+#line 156 "locfile-kw.gperf"
{"yesstr", tok_yesstr, 0},
{""},
#line 89 "locfile-kw.gperf"
@@ -190,7 +190,7 @@ locfile_hash (register const char *str, register unsigned int len)
{""},
#line 137 "locfile-kw.gperf"
{"t_fmt", tok_t_fmt, 0},
-#line 158 "locfile-kw.gperf"
+#line 159 "locfile-kw.gperf"
{"height", tok_height, 0},
{""}, {""},
#line 52 "locfile-kw.gperf"
@@ -213,7 +213,7 @@ locfile_hash (register const char *str, register unsigned int len)
{""},
#line 142 "locfile-kw.gperf"
{"era_d_fmt", tok_era_d_fmt, 0},
-#line 188 "locfile-kw.gperf"
+#line 189 "locfile-kw.gperf"
{"title", tok_title, 0},
{""}, {""},
#line 149 "locfile-kw.gperf"
@@ -243,7 +243,7 @@ locfile_hash (register const char *str, register unsigned int len)
{"duo_n_cs_precedes", tok_duo_n_cs_precedes, 0},
#line 127 "locfile-kw.gperf"
{"thousands_sep", tok_thousands_sep, 0},
-#line 196 "locfile-kw.gperf"
+#line 197 "locfile-kw.gperf"
{"territory", tok_territory, 0},
#line 36 "locfile-kw.gperf"
{"digit", tok_digit, 0},
@@ -258,7 +258,7 @@ locfile_hash (register const char *str, register unsigned int len)
{""},
#line 78 "locfile-kw.gperf"
{"else", tok_else, 0},
-#line 183 "locfile-kw.gperf"
+#line 184 "locfile-kw.gperf"
{"int_select", tok_int_select, 0},
{""}, {""}, {""},
#line 132 "locfile-kw.gperf"
@@ -266,11 +266,11 @@ locfile_hash (register const char *str, register unsigned int len)
#line 33 "locfile-kw.gperf"
{"upper", tok_upper, 0},
{""}, {""},
-#line 193 "locfile-kw.gperf"
+#line 194 "locfile-kw.gperf"
{"tel", tok_tel, 0},
#line 93 "locfile-kw.gperf"
{"p_sep_by_space", tok_p_sep_by_space, 0},
-#line 159 "locfile-kw.gperf"
+#line 160 "locfile-kw.gperf"
{"width", tok_width, 0},
{""},
#line 98 "locfile-kw.gperf"
@@ -301,7 +301,7 @@ locfile_hash (register const char *str, register unsigned int len)
{""}, {""}, {""}, {""}, {""},
#line 58 "locfile-kw.gperf"
{"section-symbol", tok_section_symbol, 0},
-#line 184 "locfile-kw.gperf"
+#line 185 "locfile-kw.gperf"
{"int_prefix", tok_int_prefix, 0},
{""}, {""}, {""}, {""},
#line 42 "locfile-kw.gperf"
@@ -318,7 +318,7 @@ locfile_hash (register const char *str, register unsigned int len)
{"duo_p_sep_by_space", tok_duo_p_sep_by_space, 0},
#line 118 "locfile-kw.gperf"
{"duo_int_p_sign_posn", tok_duo_int_p_sign_posn, 0},
-#line 156 "locfile-kw.gperf"
+#line 157 "locfile-kw.gperf"
{"nostr", tok_nostr, 0},
{""}, {""},
#line 140 "locfile-kw.gperf"
@@ -327,26 +327,26 @@ locfile_hash (register const char *str, register unsigned int len)
#line 84 "locfile-kw.gperf"
{"currency_symbol", tok_currency_symbol, 0},
{""},
-#line 166 "locfile-kw.gperf"
+#line 167 "locfile-kw.gperf"
{"name_ms", tok_name_ms, 0},
-#line 164 "locfile-kw.gperf"
- {"name_mrs", tok_name_mrs, 0},
#line 165 "locfile-kw.gperf"
+ {"name_mrs", tok_name_mrs, 0},
+#line 166 "locfile-kw.gperf"
{"name_miss", tok_name_miss, 0},
#line 83 "locfile-kw.gperf"
{"int_curr_symbol", tok_int_curr_symbol, 0},
-#line 189 "locfile-kw.gperf"
+#line 190 "locfile-kw.gperf"
{"source", tok_source, 0},
-#line 163 "locfile-kw.gperf"
+#line 164 "locfile-kw.gperf"
{"name_mr", tok_name_mr, 0},
-#line 162 "locfile-kw.gperf"
+#line 163 "locfile-kw.gperf"
{"name_gen", tok_name_gen, 0},
-#line 201 "locfile-kw.gperf"
+#line 202 "locfile-kw.gperf"
{"date", tok_date, 0},
{""}, {""},
-#line 190 "locfile-kw.gperf"
+#line 191 "locfile-kw.gperf"
{"address", tok_address, 0},
-#line 161 "locfile-kw.gperf"
+#line 162 "locfile-kw.gperf"
{"name_fmt", tok_name_fmt, 0},
#line 32 "locfile-kw.gperf"
{"copy", tok_copy, 0},
@@ -365,16 +365,16 @@ locfile_hash (register const char *str, register unsigned int len)
#line 117 "locfile-kw.gperf"
{"duo_n_sign_posn", tok_duo_n_sign_posn, 0},
{""},
-#line 169 "locfile-kw.gperf"
+#line 170 "locfile-kw.gperf"
{"country_name", tok_country_name, 0},
#line 71 "locfile-kw.gperf"
{"reorder-after", tok_reorder_after, 0},
{""}, {""},
-#line 154 "locfile-kw.gperf"
+#line 155 "locfile-kw.gperf"
{"noexpr", tok_noexpr, 0},
#line 50 "locfile-kw.gperf"
{"tolower", tok_tolower, 0},
-#line 197 "locfile-kw.gperf"
+#line 198 "locfile-kw.gperf"
{"audience", tok_audience, 0},
{""}, {""}, {""},
#line 49 "locfile-kw.gperf"
@@ -395,7 +395,7 @@ locfile_hash (register const char *str, register unsigned int len)
{""},
#line 102 "locfile-kw.gperf"
{"int_p_sign_posn", tok_int_p_sign_posn, 0},
-#line 174 "locfile-kw.gperf"
+#line 175 "locfile-kw.gperf"
{"country_car", tok_country_car, 0},
{""}, {""},
#line 104 "locfile-kw.gperf"
@@ -406,9 +406,9 @@ locfile_hash (register const char *str, register unsigned int len)
{""}, {""},
#line 116 "locfile-kw.gperf"
{"duo_p_sign_posn", tok_duo_p_sign_posn, 0},
-#line 186 "locfile-kw.gperf"
+#line 187 "locfile-kw.gperf"
{"measurement", tok_measurement, 0},
-#line 175 "locfile-kw.gperf"
+#line 176 "locfile-kw.gperf"
{"country_isbn", tok_country_isbn, 0},
#line 37 "locfile-kw.gperf"
{"outdigit", tok_outdigit, 0},
@@ -418,9 +418,9 @@ locfile_hash (register const char *str, register unsigned int len)
{""}, {""}, {""},
#line 34 "locfile-kw.gperf"
{"lower", tok_lower, 0},
-#line 182 "locfile-kw.gperf"
+#line 183 "locfile-kw.gperf"
{"tel_dom_fmt", tok_tel_dom_fmt, 0},
-#line 170 "locfile-kw.gperf"
+#line 171 "locfile-kw.gperf"
{"country_post", tok_country_post, 0},
#line 148 "locfile-kw.gperf"
{"cal_direction", tok_cal_direction, 0},
@@ -430,7 +430,7 @@ locfile_hash (register const char *str, register unsigned int len)
#line 91 "locfile-kw.gperf"
{"frac_digits", tok_frac_digits, 0},
{""}, {""},
-#line 176 "locfile-kw.gperf"
+#line 177 "locfile-kw.gperf"
{"lang_name", tok_lang_name, 0},
#line 90 "locfile-kw.gperf"
{"int_frac_digits", tok_int_frac_digits, 0},
@@ -445,7 +445,7 @@ locfile_hash (register const char *str, register unsigned int len)
{""}, {""}, {""}, {""},
#line 107 "locfile-kw.gperf"
{"duo_frac_digits", tok_duo_frac_digits, 0},
-#line 181 "locfile-kw.gperf"
+#line 182 "locfile-kw.gperf"
{"tel_int_fmt", tok_tel_int_fmt, 0},
#line 123 "locfile-kw.gperf"
{"duo_valid_to", tok_duo_valid_to, 0},
@@ -455,7 +455,7 @@ locfile_hash (register const char *str, register unsigned int len)
#line 130 "locfile-kw.gperf"
{"abday", tok_abday, 0},
{""},
-#line 199 "locfile-kw.gperf"
+#line 200 "locfile-kw.gperf"
{"abbreviation", tok_abbreviation, 0},
#line 147 "locfile-kw.gperf"
{"first_workday", tok_first_workday, 0},
@@ -472,12 +472,12 @@ locfile_hash (register const char *str, register unsigned int len)
#line 45 "locfile-kw.gperf"
{"blank", tok_blank, 0},
{""}, {""},
-#line 195 "locfile-kw.gperf"
+#line 196 "locfile-kw.gperf"
{"language", tok_language, 0},
#line 120 "locfile-kw.gperf"
{"uno_valid_from", tok_uno_valid_from, 0},
{""},
-#line 198 "locfile-kw.gperf"
+#line 199 "locfile-kw.gperf"
{"application", tok_application, 0},
{""},
#line 80 "locfile-kw.gperf"
@@ -498,7 +498,7 @@ locfile_hash (register const char *str, register unsigned int len)
#line 96 "locfile-kw.gperf"
{"p_sign_posn", tok_p_sign_posn, 0},
{""},
-#line 202 "locfile-kw.gperf"
+#line 203 "locfile-kw.gperf"
{"category", tok_category, 0},
{""}, {""}, {""}, {""},
#line 134 "locfile-kw.gperf"
@@ -510,29 +510,29 @@ locfile_hash (register const char *str, register unsigned int len)
#line 63 "locfile-kw.gperf"
{"order_start", tok_order_start, 0},
{""}, {""}, {""}, {""}, {""},
-#line 177 "locfile-kw.gperf"
+#line 178 "locfile-kw.gperf"
{"lang_ab", tok_lang_ab, 0},
-#line 179 "locfile-kw.gperf"
+#line 180 "locfile-kw.gperf"
{"lang_lib", tok_lang_lib, 0},
{""}, {""}, {""},
-#line 191 "locfile-kw.gperf"
+#line 192 "locfile-kw.gperf"
{"contact", tok_contact, 0},
{""}, {""}, {""},
-#line 172 "locfile-kw.gperf"
+#line 173 "locfile-kw.gperf"
{"country_ab3", tok_country_ab3, 0},
{""}, {""}, {""},
-#line 192 "locfile-kw.gperf"
+#line 193 "locfile-kw.gperf"
{"email", tok_email, 0},
-#line 171 "locfile-kw.gperf"
+#line 172 "locfile-kw.gperf"
{"country_ab2", tok_country_ab2, 0},
{""}, {""}, {""},
#line 55 "locfile-kw.gperf"
{"default_missing", tok_default_missing, 0},
{""}, {""},
-#line 194 "locfile-kw.gperf"
+#line 195 "locfile-kw.gperf"
{"fax", tok_fax, 0},
{""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 173 "locfile-kw.gperf"
+#line 174 "locfile-kw.gperf"
{"country_num", tok_country_num, 0},
{""}, {""}, {""}, {""}, {""}, {""},
#line 51 "locfile-kw.gperf"
@@ -560,7 +560,9 @@ locfile_hash (register const char *str, register unsigned int len)
#line 59 "locfile-kw.gperf"
{"collating-element", tok_collating_element, 0},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 152 "locfile-kw.gperf"
+ {"ab_alt_mon", tok_ab_alt_mon, 0},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
@@ -571,7 +573,7 @@ locfile_hash (register const char *str, register unsigned int len)
#line 85 "locfile-kw.gperf"
{"mon_decimal_point", tok_mon_decimal_point, 0},
{""}, {""},
-#line 168 "locfile-kw.gperf"
+#line 169 "locfile-kw.gperf"
{"postal_fmt", tok_postal_fmt, 0},
{""}, {""}, {""}, {""}, {""},
#line 60 "locfile-kw.gperf"
@@ -590,7 +592,7 @@ locfile_hash (register const char *str, register unsigned int len)
#line 87 "locfile-kw.gperf"
{"mon_grouping", tok_mon_grouping, 0},
{""},
-#line 178 "locfile-kw.gperf"
+#line 179 "locfile-kw.gperf"
{"lang_term", tok_lang_term, 0},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
diff --git a/locale/programs/locfile-token.h b/locale/programs/locfile-token.h
index d49da5e..e3cd18e 100644
--- a/locale/programs/locfile-token.h
+++ b/locale/programs/locfile-token.h
@@ -187,6 +187,7 @@ enum token_t
tok_timezone,
tok_date_fmt,
tok_alt_mon,
+ tok_ab_alt_mon,
tok_lc_messages,
tok_yesexpr,
tok_noexpr,
diff --git a/time/Makefile b/time/Makefile
index 2deb025..0db1206 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -49,7 +49,7 @@ include ../Rules
ifeq ($(run-built-tests),yes)
LOCALES := de_DE.ISO-8859-1 en_US.ISO-8859-1 ja_JP.EUC-JP fr_FR.UTF-8 \
- pl_PL.UTF-8
+ es_ES.UTF-8 pl_PL.UTF-8 ru_RU.UTF-8
include ../gen-locales.mk
$(objpfx)tst-ftime_l.out: $(gen-locales)
diff --git a/time/strftime_l.c b/time/strftime_l.c
index ac5d28f..c71f9f4 100644
--- a/time/strftime_l.c
+++ b/time/strftime_l.c
@@ -106,6 +106,7 @@ extern char *tzname[];
# define UCHAR_T unsigned char
# define L_(Str) Str
# define NLW(Sym) Sym
+# define ABALTMON_1 _NL_ABALTMON_1
# if !defined STDC_HEADERS && !defined HAVE_MEMCPY
# define MEMCPY(d, s, n) bcopy ((s), (d), (n))
@@ -492,6 +493,9 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format,
# define f_month \
((const CHAR_T *) (tp->tm_mon < 0 || tp->tm_mon > 11 \
? "?" : _NL_CURRENT (LC_TIME, NLW(MON_1) + tp->tm_mon)))
+# define a_altmonth \
+ ((const CHAR_T *) (tp->tm_mon < 0 || tp->tm_mon > 11 \
+ ? "?" : _NL_CURRENT (LC_TIME, NLW(ABALTMON_1) + tp->tm_mon)))
# define f_altmonth \
((const CHAR_T *) (tp->tm_mon < 0 || tp->tm_mon > 11 \
? "?" : _NL_CURRENT (LC_TIME, NLW(ALTMON_1) + tp->tm_mon)))
@@ -501,6 +505,7 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format,
# define aw_len STRLEN (a_wkday)
# define am_len STRLEN (a_month)
+# define aam_len STRLEN (a_altmonth)
# define ap_len STRLEN (ampm)
#else
# if !HAVE_STRFTIME
@@ -510,11 +515,13 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format,
? "?" : month_name[tp->tm_mon])
# define a_wkday f_wkday
# define a_month f_month
+# define a_altmonth a_month
# define f_altmonth f_month
# define ampm (L_("AMPM") + 2 * (tp->tm_hour > 11))
size_t aw_len = 3;
size_t am_len = 3;
+ size_t aam_len = 3;
size_t ap_len = 2;
# endif
#endif
@@ -779,10 +786,13 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format,
to_uppcase = 1;
to_lowcase = 0;
}
- if (modifier != 0)
+ if (modifier == L_('E'))
goto bad_format;
#if defined _NL_CURRENT || !HAVE_STRFTIME
- cpy (am_len, a_month);
+ if (modifier == L_('O'))
+ cpy (aam_len, a_altmonth);
+ else
+ cpy (am_len, a_month);
break;
#else
goto underlying_strftime;
diff --git a/time/strptime_l.c b/time/strptime_l.c
index 39cf38d..cd901c2 100644
--- a/time/strptime_l.c
+++ b/time/strptime_l.c
@@ -126,6 +126,8 @@ extern const struct __locale_data _nl_C_LC_TIME attribute_hidden;
# define ab_month_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ABMON_1)].string)
# define alt_month_name \
(&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ALTMON_1)].string)
+# define ab_alt_month_name \
+ (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (_NL_ABALTMON_1)].string)
# define HERE_D_T_FMT (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (D_T_FMT)].string)
# define HERE_D_FMT (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (D_FMT)].string)
# define HERE_AM_STR (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (AM_STR)].string)
@@ -437,6 +439,18 @@ __strptime_internal (const char *rp, const char *fmt, struct tm *tmp,
alt_month_name[cnt]))
decided_longest = loc;
}
+ trp = rp;
+ if (match_string (_NL_CURRENT (LC_TIME, _NL_ABALTMON_1 + cnt),
+ trp)
+ && trp > rp_longest)
+ {
+ rp_longest = trp;
+ cnt_longest = cnt;
+ if (s.decided == not
+ && strcmp (_NL_CURRENT (LC_TIME, _NL_ABALTMON_1 + cnt),
+ alt_month_name[cnt]))
+ decided_longest = loc;
+ }
#endif
}
#endif
@@ -448,6 +462,8 @@ __strptime_internal (const char *rp, const char *fmt, struct tm *tmp,
#ifdef _LIBC
|| ((trp = rp, match_string (alt_month_name[cnt], trp))
&& trp > rp_longest)
+ || ((trp = rp, match_string (ab_alt_month_name[cnt], trp))
+ && trp > rp_longest)
#endif
))
{
@@ -1035,7 +1051,9 @@ __strptime_internal (const char *rp, const char *fmt, struct tm *tmp,
case 'O':
switch (*fmt++)
{
+ case 'b':
case 'B':
+ case 'h':
/* Match month name. Reprocess as plain 'B'. */
fmt--;
goto start_over;
diff --git a/time/tst-strptime.c b/time/tst-strptime.c
index 62ecb7c..2eac5a2 100644
--- a/time/tst-strptime.c
+++ b/time/tst-strptime.c
@@ -56,6 +56,7 @@ static const struct
{ "en_US.ISO-8859-1", "November 17, 2017", "%B %e, %Y", 5, 320, 10, 17 },
{ "de_DE.ISO-8859-1", "18. Nov 2017", "%d. %b %Y", 6, 321, 10, 18 },
{ "fr_FR.UTF-8", "19 novembre 2017", "%d %OB %Y", 0, 322, 10, 19 },
+ { "es_ES.UTF-8", "20 de nov de 2017", "%d de %Ob de %Y", 1, 323, 10, 20 },
/* Some languages do need the declension of the month names. */
{ "pl_PL.UTF-8", "21 lis 2017", "%d %b %Y", 2, 324, 10, 21 },
{ "pl_PL.UTF-8", "22 LIS 2017", "%d %B %Y", 3, 325, 10, 22 },
@@ -63,6 +64,14 @@ static const struct
{ "pl_PL.UTF-8", "23 listopad 2017", "%d %B %Y", 4, 326, 10, 23 },
/* The nominative case is incorrect here but it is parseable. */
{ "pl_PL.UTF-8", "24 listopad 2017", "%d %OB %Y", 5, 327, 10, 24 },
+ { "pl_PL.UTF-8", "25 lis 2017", "%d %Ob %Y", 6, 328, 10, 25 },
+ /* ноÑ? - pronounce: 'noya' - "Nov" (abbreviated "November") in Russian. */
+ { "ru_RU.UTF-8", "26 ноÑ? 2017", "%d %b %Y", 0, 329, 10, 26 },
+ /* TODO: Add an example of "may"/"maya" (5th month, May) using %Ob in
+ Russian when the localedata is updated. Without the genitive forms
+ in localedata the word "maya" is ambiguous and may be mistaken for
+ "mart" (March).
+ */
};
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=95cb863a1ef7760a11272bbd7ba5fe62dc41be54
commit 95cb863a1ef7760a11272bbd7ba5fe62dc41be54
Author: Rafal Luzynski <digitalfreak@lingonborough.com>
Date: Tue Nov 14 02:19:35 2017 +0100
Implement alternative month names (bug 10871).
Some languages (Slavic, Baltic, etc.) require a genitive case of the
month name when formatting a full date (with the day number) while
they require a nominative case when referring to the month standalone.
This requirement cannot be fulfilled without providing two forms for
each month name. From now it is specified that nl_langinfo(MON_1)
series (up to MON_12) and strftime("%B") generate the month names in
the grammatical form used when the month is a part of a complete date.
If the grammatical form used when the month is named by itself is needed,
the new values nl_langinfo(ALTMON_1) (up to ALTMON_12) and
strftime("%OB") are supported. This new feature is optional so the
languages which do not need it or do not yet provide the updated
locales simply do not use it and their behaviour is unchanged.
[BZ #10871]
* locale/C-time.c (_nl_C_LC_TIME): Add alternative month names,
define them as the same as primary full month names explicitly.
* locale/categories.def (LC_TIME): Add alt_mon and wide-alt_mon.
* locale/langinfo.h (__ALTMON_1, __ALTMON_2, __ALTMON_3, __ALTMON_4,
__ALTMON_5, __ALTMON_6, __ALTMON_7, __ALTMON_8, __ALTMON_9, __ALTMON_10,
__ALTMON_11, __ALTMON_12, _NL_WALTMON_1, _NL_WALTMON_2, _NL_WALTMON_3,
_NL_WALTMON_4, _NL_WALTMON_5, _NL_WALTMON_6, _NL_WALTMON_7,
_NL_WALTMON_8, _NL_WALTMON_9, _NL_WALTMON_10, _NL_WALTMON_11,
_NL_WALTMON_12): New enum constants.
[__USE_GNU] (ALTMON_1, ALTMON_2, ALTMON_3, ALTMON_4, ALTMON_5, ALTMON_6,
ALTMON_7, ALTMON_8, ALTMON_9, ALTMON_10, ALTMON_11, ALTMON_12): New
macros.
* locale/programs/ld-time.c (struct locale_time_t): Add alt_mon,
walt_mon, and alt_mon_defined members.
(time_output): Output alt_mon and walt_mon members.
(time_read): Read them, initialize them as copies of mon and wmon
respectively if they are missing, initialize alt_mon_defined.
* locale/programs/locfile-kw.gperf (alt_mon): Define.
* locale/programs/locfile-kw.h: Regenerate.
* locale/programs/locfile-token.h (tok_alt_mon): New enum constant.
* localedata/tst-langinfo.c (map): Add tests for the new constants
ALTMON_1 .. ALTMON_12.
* time/Makefile [$(run-built-tests) = yes] (LOCALES): Add fr_FR.UTF-8
and pl_PL.UTF-8.
* time/strftime_l.c (f_altmonth): New macro.
(__strftime_internal): Handle %OB format.
* time/strptime_l.c [_LIBC] (alt_month_name): New macro.
(__strptime_internal): Handle %OB format.
* time/tst-strptime.c (day_tests): Add tests to parse different forms
of month names including the new %OB format specifier.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
diff --git a/ChangeLog b/ChangeLog
index cb9e14c..8c333bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2018-01-22 Rafal Luzynski <digitalfreak@lingonborough.com>
+
+ [BZ #10871]
+ * locale/C-time.c (_nl_C_LC_TIME): Add alternative month names,
+ define them as the same as primary full month names explicitly.
+ * locale/categories.def (LC_TIME): Add alt_mon and wide-alt_mon.
+ * locale/langinfo.h (__ALTMON_1, __ALTMON_2, __ALTMON_3, __ALTMON_4,
+ __ALTMON_5, __ALTMON_6, __ALTMON_7, __ALTMON_8, __ALTMON_9, __ALTMON_10,
+ __ALTMON_11, __ALTMON_12, _NL_WALTMON_1, _NL_WALTMON_2, _NL_WALTMON_3,
+ _NL_WALTMON_4, _NL_WALTMON_5, _NL_WALTMON_6, _NL_WALTMON_7,
+ _NL_WALTMON_8, _NL_WALTMON_9, _NL_WALTMON_10, _NL_WALTMON_11,
+ _NL_WALTMON_12): New enum constants.
+ [__USE_GNU] (ALTMON_1, ALTMON_2, ALTMON_3, ALTMON_4, ALTMON_5, ALTMON_6,
+ ALTMON_7, ALTMON_8, ALTMON_9, ALTMON_10, ALTMON_11, ALTMON_12): New
+ macros.
+ * locale/programs/ld-time.c (struct locale_time_t): Add alt_mon,
+ walt_mon, and alt_mon_defined members.
+ (time_output): Output alt_mon and walt_mon members.
+ (time_read): Read them, initialize them as copies of mon and wmon
+ respectively if they are missing, initialize alt_mon_defined.
+ * locale/programs/locfile-kw.gperf (alt_mon): Define.
+ * locale/programs/locfile-kw.h: Regenerate.
+ * locale/programs/locfile-token.h (tok_alt_mon): New enum constant.
+ * localedata/tst-langinfo.c (map): Add tests for the new constants
+ ALTMON_1 .. ALTMON_12.
+ * time/Makefile [$(run-built-tests) = yes] (LOCALES): Add fr_FR.UTF-8
+ and pl_PL.UTF-8.
+ * time/strftime_l.c (f_altmonth): New macro.
+ (__strftime_internal): Handle %OB format.
+ * time/strptime_l.c [_LIBC] (alt_month_name): New macro.
+ (__strptime_internal): Handle %OB format.
+ * time/tst-strptime.c (day_tests): Add tests to parse different forms
+ of month names including the new %OB format specifier.
+
2018-01-19 Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
[BZ #22685]
diff --git a/locale/C-time.c b/locale/C-time.c
index 1f1ee01..73bc700 100644
--- a/locale/C-time.c
+++ b/locale/C-time.c
@@ -30,7 +30,7 @@ const struct __locale_data _nl_C_LC_TIME attribute_hidden =
{ NULL, }, /* no cached data */
UNDELETABLE,
0,
- 111,
+ 135,
{
{ .string = "Sun" },
{ .string = "Mon" },
@@ -142,6 +142,30 @@ const struct __locale_data _nl_C_LC_TIME attribute_hidden =
{ .string = "" },
{ .string = "%a %b %e %H:%M:%S %Z %Y" },
{ .wstr = (const uint32_t *) L"%a %b %e %H:%M:%S %Z %Y" },
- { .string = _nl_C_codeset }
+ { .string = _nl_C_codeset },
+ { .string = "January" },
+ { .string = "February" },
+ { .string = "March" },
+ { .string = "April" },
+ { .string = "May" },
+ { .string = "June" },
+ { .string = "July" },
+ { .string = "August" },
+ { .string = "September" },
+ { .string = "October" },
+ { .string = "November" },
+ { .string = "December" },
+ { .wstr = (const uint32_t *) L"January" },
+ { .wstr = (const uint32_t *) L"February" },
+ { .wstr = (const uint32_t *) L"March" },
+ { .wstr = (const uint32_t *) L"April" },
+ { .wstr = (const uint32_t *) L"May" },
+ { .wstr = (const uint32_t *) L"June" },
+ { .wstr = (const uint32_t *) L"July" },
+ { .wstr = (const uint32_t *) L"August" },
+ { .wstr = (const uint32_t *) L"September" },
+ { .wstr = (const uint32_t *) L"October" },
+ { .wstr = (const uint32_t *) L"November" },
+ { .wstr = (const uint32_t *) L"December" }
}
};
diff --git a/locale/categories.def b/locale/categories.def
index 47947f7..3cbb4e6 100644
--- a/locale/categories.def
+++ b/locale/categories.def
@@ -249,6 +249,8 @@ DEFINE_CATEGORY
DEFINE_ELEMENT (_DATE_FMT, "date_fmt", opt, string)
DEFINE_ELEMENT (_NL_W_DATE_FMT, "wide-date_fmt", opt, wstring)
DEFINE_ELEMENT (_NL_TIME_CODESET, "time-codeset", std, string)
+ DEFINE_ELEMENT (ALTMON_1, "alt_mon", opt, stringarray, 12, 12)
+ DEFINE_ELEMENT (_NL_WALTMON_1, "wide-alt_mon", opt, wstringarray, 12, 12)
), NO_POSTLOAD)
diff --git a/locale/langinfo.h b/locale/langinfo.h
index 28a0a73..65374dd 100644
--- a/locale/langinfo.h
+++ b/locale/langinfo.h
@@ -100,7 +100,8 @@ enum
ABMON_12,
#define ABMON_12 ABMON_12
- /* Long month names. */
+ /* Long month names, in the grammatical form used when the month
+ is a part of a complete date. */
MON_1, /* January */
#define MON_1 MON_1
MON_2,
@@ -189,7 +190,8 @@ enum
_NL_WABMON_11,
_NL_WABMON_12,
- /* Long month names. */
+ /* Long month names, in the grammatical form used when the month
+ is a part of a complete date. */
_NL_WMON_1, /* January */
_NL_WMON_2,
_NL_WMON_3,
@@ -231,6 +233,50 @@ enum
_NL_TIME_CODESET,
+ /* Long month names, in the grammatical form used when the month
+ is named by itself. */
+ __ALTMON_1, /* January */
+ __ALTMON_2,
+ __ALTMON_3,
+ __ALTMON_4,
+ __ALTMON_5,
+ __ALTMON_6,
+ __ALTMON_7,
+ __ALTMON_8,
+ __ALTMON_9,
+ __ALTMON_10,
+ __ALTMON_11,
+ __ALTMON_12,
+#ifdef __USE_GNU
+# define ALTMON_1 __ALTMON_1
+# define ALTMON_2 __ALTMON_2
+# define ALTMON_3 __ALTMON_3
+# define ALTMON_4 __ALTMON_4
+# define ALTMON_5 __ALTMON_5
+# define ALTMON_6 __ALTMON_6
+# define ALTMON_7 __ALTMON_7
+# define ALTMON_8 __ALTMON_8
+# define ALTMON_9 __ALTMON_9
+# define ALTMON_10 __ALTMON_10
+# define ALTMON_11 __ALTMON_11
+# define ALTMON_12 __ALTMON_12
+#endif
+
+ /* Long month names, in the grammatical form used when the month
+ is named by itself. */
+ _NL_WALTMON_1, /* January */
+ _NL_WALTMON_2,
+ _NL_WALTMON_3,
+ _NL_WALTMON_4,
+ _NL_WALTMON_5,
+ _NL_WALTMON_6,
+ _NL_WALTMON_7,
+ _NL_WALTMON_8,
+ _NL_WALTMON_9,
+ _NL_WALTMON_10,
+ _NL_WALTMON_11,
+ _NL_WALTMON_12,
+
_NL_NUM_LC_TIME, /* Number of indices in LC_TIME category. */
/* LC_COLLATE category: text sorting.
diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c
index 67d055a..4186448 100644
--- a/locale/programs/ld-time.c
+++ b/locale/programs/ld-time.c
@@ -91,6 +91,9 @@ struct locale_time_t
const char *date_fmt;
const uint32_t *wdate_fmt;
int alt_digits_defined;
+ const char *alt_mon[12];
+ const uint32_t *walt_mon[12];
+ int alt_mon_defined;
unsigned char week_ndays;
uint32_t week_1stday;
unsigned char week_1stweek;
@@ -639,6 +642,15 @@ time_output (struct localedef_t *locale, const struct charmap_t *charmap,
add_locale_string (&file, time->date_fmt);
add_locale_wstring (&file, time->wdate_fmt);
add_locale_string (&file, charmap->code_set_name);
+
+ /* The alt'mons. */
+ for (n = 0; n < 12; ++n)
+ add_locale_string (&file, time->alt_mon[n] ?: "");
+
+ /* The wide character alt'mons. */
+ for (n = 0; n < 12; ++n)
+ add_locale_wstring (&file, time->walt_mon[n] ?: empty_wstr);
+
write_locale_data (output_path, LC_TIME, "LC_TIME", &file);
}
@@ -782,6 +794,7 @@ time_read (struct linereader *ldfile, struct localedef_t *result,
STRARR_ELEM (mon, 12, 12);
STRARR_ELEM (am_pm, 2, 2);
STRARR_ELEM (alt_digits, 0, 100);
+ STRARR_ELEM (alt_mon, 12, 12);
case tok_era:
/* Ignore the rest of the line if we don't need the input of
@@ -934,6 +947,14 @@ time_read (struct linereader *ldfile, struct localedef_t *result,
lr_error (ldfile, _("\
%1$s: definition does not end with `END %1$s'"), "LC_TIME");
lr_ignore_rest (ldfile, now->tok == tok_lc_time);
+
+ /* If alt_mon was not specified, make it a copy of mon. */
+ if (!ignore_content && !time->alt_mon_defined)
+ {
+ memcpy (time->alt_mon, time->mon, sizeof (time->mon));
+ memcpy (time->walt_mon, time->wmon, sizeof (time->wmon));
+ time->alt_mon_defined = 1;
+ }
return;
default:
diff --git a/locale/programs/locfile-kw.gperf b/locale/programs/locfile-kw.gperf
index c74c1f2..dad7f21 100644
--- a/locale/programs/locfile-kw.gperf
+++ b/locale/programs/locfile-kw.gperf
@@ -148,6 +148,7 @@ first_workday, tok_first_workday, 0
cal_direction, tok_cal_direction, 0
timezone, tok_timezone, 0
date_fmt, tok_date_fmt, 0
+alt_mon, tok_alt_mon, 0
LC_MESSAGES, tok_lc_messages, 0
yesexpr, tok_yesexpr, 0
noexpr, tok_noexpr, 0
diff --git a/locale/programs/locfile-kw.h b/locale/programs/locfile-kw.h
index b9faa28..10d9d9a 100644
--- a/locale/programs/locfile-kw.h
+++ b/locale/programs/locfile-kw.h
@@ -54,7 +54,7 @@
#line 24 "locfile-kw.gperf"
struct keyword_t ;
-#define TOTAL_KEYWORDS 176
+#define TOTAL_KEYWORDS 177
#define MIN_WORD_LENGTH 3
#define MAX_WORD_LENGTH 22
#define MIN_HASH_VALUE 3
@@ -147,22 +147,22 @@ locfile_hash (register const char *str, register unsigned int len)
#line 30 "locfile-kw.gperf"
{"LC_CTYPE", tok_lc_ctype, 0},
{""},
-#line 166 "locfile-kw.gperf"
+#line 167 "locfile-kw.gperf"
{"LC_ADDRESS", tok_lc_address, 0},
-#line 151 "locfile-kw.gperf"
+#line 152 "locfile-kw.gperf"
{"LC_MESSAGES", tok_lc_messages, 0},
-#line 159 "locfile-kw.gperf"
+#line 160 "locfile-kw.gperf"
{"LC_NAME", tok_lc_name, 0},
-#line 156 "locfile-kw.gperf"
+#line 157 "locfile-kw.gperf"
{"LC_PAPER", tok_lc_paper, 0},
-#line 184 "locfile-kw.gperf"
+#line 185 "locfile-kw.gperf"
{"LC_MEASUREMENT", tok_lc_measurement, 0},
#line 56 "locfile-kw.gperf"
{"LC_COLLATE", tok_lc_collate, 0},
{""},
-#line 186 "locfile-kw.gperf"
+#line 187 "locfile-kw.gperf"
{"LC_IDENTIFICATION", tok_lc_identification, 0},
-#line 199 "locfile-kw.gperf"
+#line 200 "locfile-kw.gperf"
{"revision", tok_revision, 0},
#line 69 "locfile-kw.gperf"
{"UNDEFINED", tok_undefined, 0},
@@ -170,19 +170,19 @@ locfile_hash (register const char *str, register unsigned int len)
{"LC_NUMERIC", tok_lc_numeric, 0},
#line 82 "locfile-kw.gperf"
{"LC_MONETARY", tok_lc_monetary, 0},
-#line 179 "locfile-kw.gperf"
+#line 180 "locfile-kw.gperf"
{"LC_TELEPHONE", tok_lc_telephone, 0},
{""}, {""}, {""},
#line 75 "locfile-kw.gperf"
{"define", tok_define, 0},
-#line 152 "locfile-kw.gperf"
+#line 153 "locfile-kw.gperf"
{"yesexpr", tok_yesexpr, 0},
#line 141 "locfile-kw.gperf"
{"era_year", tok_era_year, 0},
{""},
#line 54 "locfile-kw.gperf"
{"translit_ignore", tok_translit_ignore, 0},
-#line 154 "locfile-kw.gperf"
+#line 155 "locfile-kw.gperf"
{"yesstr", tok_yesstr, 0},
{""},
#line 89 "locfile-kw.gperf"
@@ -190,7 +190,7 @@ locfile_hash (register const char *str, register unsigned int len)
{""},
#line 137 "locfile-kw.gperf"
{"t_fmt", tok_t_fmt, 0},
-#line 157 "locfile-kw.gperf"
+#line 158 "locfile-kw.gperf"
{"height", tok_height, 0},
{""}, {""},
#line 52 "locfile-kw.gperf"
@@ -213,7 +213,7 @@ locfile_hash (register const char *str, register unsigned int len)
{""},
#line 142 "locfile-kw.gperf"
{"era_d_fmt", tok_era_d_fmt, 0},
-#line 187 "locfile-kw.gperf"
+#line 188 "locfile-kw.gperf"
{"title", tok_title, 0},
{""}, {""},
#line 149 "locfile-kw.gperf"
@@ -243,7 +243,7 @@ locfile_hash (register const char *str, register unsigned int len)
{"duo_n_cs_precedes", tok_duo_n_cs_precedes, 0},
#line 127 "locfile-kw.gperf"
{"thousands_sep", tok_thousands_sep, 0},
-#line 195 "locfile-kw.gperf"
+#line 196 "locfile-kw.gperf"
{"territory", tok_territory, 0},
#line 36 "locfile-kw.gperf"
{"digit", tok_digit, 0},
@@ -258,7 +258,7 @@ locfile_hash (register const char *str, register unsigned int len)
{""},
#line 78 "locfile-kw.gperf"
{"else", tok_else, 0},
-#line 182 "locfile-kw.gperf"
+#line 183 "locfile-kw.gperf"
{"int_select", tok_int_select, 0},
{""}, {""}, {""},
#line 132 "locfile-kw.gperf"
@@ -266,11 +266,11 @@ locfile_hash (register const char *str, register unsigned int len)
#line 33 "locfile-kw.gperf"
{"upper", tok_upper, 0},
{""}, {""},
-#line 192 "locfile-kw.gperf"
+#line 193 "locfile-kw.gperf"
{"tel", tok_tel, 0},
#line 93 "locfile-kw.gperf"
{"p_sep_by_space", tok_p_sep_by_space, 0},
-#line 158 "locfile-kw.gperf"
+#line 159 "locfile-kw.gperf"
{"width", tok_width, 0},
{""},
#line 98 "locfile-kw.gperf"
@@ -301,7 +301,7 @@ locfile_hash (register const char *str, register unsigned int len)
{""}, {""}, {""}, {""}, {""},
#line 58 "locfile-kw.gperf"
{"section-symbol", tok_section_symbol, 0},
-#line 183 "locfile-kw.gperf"
+#line 184 "locfile-kw.gperf"
{"int_prefix", tok_int_prefix, 0},
{""}, {""}, {""}, {""},
#line 42 "locfile-kw.gperf"
@@ -318,7 +318,7 @@ locfile_hash (register const char *str, register unsigned int len)
{"duo_p_sep_by_space", tok_duo_p_sep_by_space, 0},
#line 118 "locfile-kw.gperf"
{"duo_int_p_sign_posn", tok_duo_int_p_sign_posn, 0},
-#line 155 "locfile-kw.gperf"
+#line 156 "locfile-kw.gperf"
{"nostr", tok_nostr, 0},
{""}, {""},
#line 140 "locfile-kw.gperf"
@@ -327,26 +327,26 @@ locfile_hash (register const char *str, register unsigned int len)
#line 84 "locfile-kw.gperf"
{"currency_symbol", tok_currency_symbol, 0},
{""},
-#line 165 "locfile-kw.gperf"
+#line 166 "locfile-kw.gperf"
{"name_ms", tok_name_ms, 0},
-#line 163 "locfile-kw.gperf"
- {"name_mrs", tok_name_mrs, 0},
#line 164 "locfile-kw.gperf"
+ {"name_mrs", tok_name_mrs, 0},
+#line 165 "locfile-kw.gperf"
{"name_miss", tok_name_miss, 0},
#line 83 "locfile-kw.gperf"
{"int_curr_symbol", tok_int_curr_symbol, 0},
-#line 188 "locfile-kw.gperf"
+#line 189 "locfile-kw.gperf"
{"source", tok_source, 0},
-#line 162 "locfile-kw.gperf"
+#line 163 "locfile-kw.gperf"
{"name_mr", tok_name_mr, 0},
-#line 161 "locfile-kw.gperf"
+#line 162 "locfile-kw.gperf"
{"name_gen", tok_name_gen, 0},
-#line 200 "locfile-kw.gperf"
+#line 201 "locfile-kw.gperf"
{"date", tok_date, 0},
{""}, {""},
-#line 189 "locfile-kw.gperf"
+#line 190 "locfile-kw.gperf"
{"address", tok_address, 0},
-#line 160 "locfile-kw.gperf"
+#line 161 "locfile-kw.gperf"
{"name_fmt", tok_name_fmt, 0},
#line 32 "locfile-kw.gperf"
{"copy", tok_copy, 0},
@@ -365,16 +365,16 @@ locfile_hash (register const char *str, register unsigned int len)
#line 117 "locfile-kw.gperf"
{"duo_n_sign_posn", tok_duo_n_sign_posn, 0},
{""},
-#line 168 "locfile-kw.gperf"
+#line 169 "locfile-kw.gperf"
{"country_name", tok_country_name, 0},
#line 71 "locfile-kw.gperf"
{"reorder-after", tok_reorder_after, 0},
{""}, {""},
-#line 153 "locfile-kw.gperf"
+#line 154 "locfile-kw.gperf"
{"noexpr", tok_noexpr, 0},
#line 50 "locfile-kw.gperf"
{"tolower", tok_tolower, 0},
-#line 196 "locfile-kw.gperf"
+#line 197 "locfile-kw.gperf"
{"audience", tok_audience, 0},
{""}, {""}, {""},
#line 49 "locfile-kw.gperf"
@@ -395,7 +395,7 @@ locfile_hash (register const char *str, register unsigned int len)
{""},
#line 102 "locfile-kw.gperf"
{"int_p_sign_posn", tok_int_p_sign_posn, 0},
-#line 173 "locfile-kw.gperf"
+#line 174 "locfile-kw.gperf"
{"country_car", tok_country_car, 0},
{""}, {""},
#line 104 "locfile-kw.gperf"
@@ -406,9 +406,9 @@ locfile_hash (register const char *str, register unsigned int len)
{""}, {""},
#line 116 "locfile-kw.gperf"
{"duo_p_sign_posn", tok_duo_p_sign_posn, 0},
-#line 185 "locfile-kw.gperf"
+#line 186 "locfile-kw.gperf"
{"measurement", tok_measurement, 0},
-#line 174 "locfile-kw.gperf"
+#line 175 "locfile-kw.gperf"
{"country_isbn", tok_country_isbn, 0},
#line 37 "locfile-kw.gperf"
{"outdigit", tok_outdigit, 0},
@@ -418,9 +418,9 @@ locfile_hash (register const char *str, register unsigned int len)
{""}, {""}, {""},
#line 34 "locfile-kw.gperf"
{"lower", tok_lower, 0},
-#line 181 "locfile-kw.gperf"
+#line 182 "locfile-kw.gperf"
{"tel_dom_fmt", tok_tel_dom_fmt, 0},
-#line 169 "locfile-kw.gperf"
+#line 170 "locfile-kw.gperf"
{"country_post", tok_country_post, 0},
#line 148 "locfile-kw.gperf"
{"cal_direction", tok_cal_direction, 0},
@@ -430,7 +430,7 @@ locfile_hash (register const char *str, register unsigned int len)
#line 91 "locfile-kw.gperf"
{"frac_digits", tok_frac_digits, 0},
{""}, {""},
-#line 175 "locfile-kw.gperf"
+#line 176 "locfile-kw.gperf"
{"lang_name", tok_lang_name, 0},
#line 90 "locfile-kw.gperf"
{"int_frac_digits", tok_int_frac_digits, 0},
@@ -445,7 +445,7 @@ locfile_hash (register const char *str, register unsigned int len)
{""}, {""}, {""}, {""},
#line 107 "locfile-kw.gperf"
{"duo_frac_digits", tok_duo_frac_digits, 0},
-#line 180 "locfile-kw.gperf"
+#line 181 "locfile-kw.gperf"
{"tel_int_fmt", tok_tel_int_fmt, 0},
#line 123 "locfile-kw.gperf"
{"duo_valid_to", tok_duo_valid_to, 0},
@@ -455,7 +455,7 @@ locfile_hash (register const char *str, register unsigned int len)
#line 130 "locfile-kw.gperf"
{"abday", tok_abday, 0},
{""},
-#line 198 "locfile-kw.gperf"
+#line 199 "locfile-kw.gperf"
{"abbreviation", tok_abbreviation, 0},
#line 147 "locfile-kw.gperf"
{"first_workday", tok_first_workday, 0},
@@ -472,12 +472,12 @@ locfile_hash (register const char *str, register unsigned int len)
#line 45 "locfile-kw.gperf"
{"blank", tok_blank, 0},
{""}, {""},
-#line 194 "locfile-kw.gperf"
+#line 195 "locfile-kw.gperf"
{"language", tok_language, 0},
#line 120 "locfile-kw.gperf"
{"uno_valid_from", tok_uno_valid_from, 0},
{""},
-#line 197 "locfile-kw.gperf"
+#line 198 "locfile-kw.gperf"
{"application", tok_application, 0},
{""},
#line 80 "locfile-kw.gperf"
@@ -498,7 +498,7 @@ locfile_hash (register const char *str, register unsigned int len)
#line 96 "locfile-kw.gperf"
{"p_sign_posn", tok_p_sign_posn, 0},
{""},
-#line 201 "locfile-kw.gperf"
+#line 202 "locfile-kw.gperf"
{"category", tok_category, 0},
{""}, {""}, {""}, {""},
#line 134 "locfile-kw.gperf"
@@ -510,29 +510,29 @@ locfile_hash (register const char *str, register unsigned int len)
#line 63 "locfile-kw.gperf"
{"order_start", tok_order_start, 0},
{""}, {""}, {""}, {""}, {""},
-#line 176 "locfile-kw.gperf"
+#line 177 "locfile-kw.gperf"
{"lang_ab", tok_lang_ab, 0},
-#line 178 "locfile-kw.gperf"
+#line 179 "locfile-kw.gperf"
{"lang_lib", tok_lang_lib, 0},
{""}, {""}, {""},
-#line 190 "locfile-kw.gperf"
+#line 191 "locfile-kw.gperf"
{"contact", tok_contact, 0},
{""}, {""}, {""},
-#line 171 "locfile-kw.gperf"
+#line 172 "locfile-kw.gperf"
{"country_ab3", tok_country_ab3, 0},
{""}, {""}, {""},
-#line 191 "locfile-kw.gperf"
+#line 192 "locfile-kw.gperf"
{"email", tok_email, 0},
-#line 170 "locfile-kw.gperf"
+#line 171 "locfile-kw.gperf"
{"country_ab2", tok_country_ab2, 0},
{""}, {""}, {""},
#line 55 "locfile-kw.gperf"
{"default_missing", tok_default_missing, 0},
{""}, {""},
-#line 193 "locfile-kw.gperf"
+#line 194 "locfile-kw.gperf"
{"fax", tok_fax, 0},
{""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 172 "locfile-kw.gperf"
+#line 173 "locfile-kw.gperf"
{"country_num", tok_country_num, 0},
{""}, {""}, {""}, {""}, {""}, {""},
#line 51 "locfile-kw.gperf"
@@ -548,7 +548,9 @@ locfile_hash (register const char *str, register unsigned int len)
{"endif", tok_endif, 0},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 151 "locfile-kw.gperf"
+ {"alt_mon", tok_alt_mon, 0},
{""}, {""}, {""}, {""}, {""}, {""}, {""},
#line 76 "locfile-kw.gperf"
{"undef", tok_undef, 0},
@@ -569,7 +571,7 @@ locfile_hash (register const char *str, register unsigned int len)
#line 85 "locfile-kw.gperf"
{"mon_decimal_point", tok_mon_decimal_point, 0},
{""}, {""},
-#line 167 "locfile-kw.gperf"
+#line 168 "locfile-kw.gperf"
{"postal_fmt", tok_postal_fmt, 0},
{""}, {""}, {""}, {""}, {""},
#line 60 "locfile-kw.gperf"
@@ -588,7 +590,7 @@ locfile_hash (register const char *str, register unsigned int len)
#line 87 "locfile-kw.gperf"
{"mon_grouping", tok_mon_grouping, 0},
{""},
-#line 177 "locfile-kw.gperf"
+#line 178 "locfile-kw.gperf"
{"lang_term", tok_lang_term, 0},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
diff --git a/locale/programs/locfile-token.h b/locale/programs/locfile-token.h
index f02325d..d49da5e 100644
--- a/locale/programs/locfile-token.h
+++ b/locale/programs/locfile-token.h
@@ -186,6 +186,7 @@ enum token_t
tok_cal_direction,
tok_timezone,
tok_date_fmt,
+ tok_alt_mon,
tok_lc_messages,
tok_yesexpr,
tok_noexpr,
diff --git a/localedata/tst-langinfo.c b/localedata/tst-langinfo.c
index 8c3667c..0d33e75 100644
--- a/localedata/tst-langinfo.c
+++ b/localedata/tst-langinfo.c
@@ -50,6 +50,18 @@ struct map
VAL (ABMON_8),
VAL (ABMON_9),
VAL (ALT_DIGITS),
+ VAL (ALTMON_1),
+ VAL (ALTMON_10),
+ VAL (ALTMON_11),
+ VAL (ALTMON_12),
+ VAL (ALTMON_2),
+ VAL (ALTMON_3),
+ VAL (ALTMON_4),
+ VAL (ALTMON_5),
+ VAL (ALTMON_6),
+ VAL (ALTMON_7),
+ VAL (ALTMON_8),
+ VAL (ALTMON_9),
VAL (AM_STR),
VAL (CRNCYSTR),
VAL (CURRENCY_SYMBOL),
diff --git a/time/Makefile b/time/Makefile
index 264eed9..2deb025 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -48,7 +48,8 @@ tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \
include ../Rules
ifeq ($(run-built-tests),yes)
-LOCALES := de_DE.ISO-8859-1 en_US.ISO-8859-1 ja_JP.EUC-JP
+LOCALES := de_DE.ISO-8859-1 en_US.ISO-8859-1 ja_JP.EUC-JP fr_FR.UTF-8 \
+ pl_PL.UTF-8
include ../gen-locales.mk
$(objpfx)tst-ftime_l.out: $(gen-locales)
diff --git a/time/strftime_l.c b/time/strftime_l.c
index 18651ff..ac5d28f 100644
--- a/time/strftime_l.c
+++ b/time/strftime_l.c
@@ -492,6 +492,9 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format,
# define f_month \
((const CHAR_T *) (tp->tm_mon < 0 || tp->tm_mon > 11 \
? "?" : _NL_CURRENT (LC_TIME, NLW(MON_1) + tp->tm_mon)))
+# define f_altmonth \
+ ((const CHAR_T *) (tp->tm_mon < 0 || tp->tm_mon > 11 \
+ ? "?" : _NL_CURRENT (LC_TIME, NLW(ALTMON_1) + tp->tm_mon)))
# define ampm \
((const CHAR_T *) _NL_CURRENT (LC_TIME, tp->tm_hour > 11 \
? NLW(PM_STR) : NLW(AM_STR)))
@@ -507,6 +510,7 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format,
? "?" : month_name[tp->tm_mon])
# define a_wkday f_wkday
# define a_month f_month
+# define f_altmonth f_month
# define ampm (L_("AMPM") + 2 * (tp->tm_hour > 11))
size_t aw_len = 3;
@@ -785,7 +789,7 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format,
#endif
case L_('B'):
- if (modifier != 0)
+ if (modifier == L_('E'))
goto bad_format;
if (change_case)
{
@@ -793,7 +797,10 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format,
to_lowcase = 0;
}
#if defined _NL_CURRENT || !HAVE_STRFTIME
- cpy (STRLEN (f_month), f_month);
+ if (modifier == L_('O'))
+ cpy (STRLEN (f_altmonth), f_altmonth);
+ else
+ cpy (STRLEN (f_month), f_month);
break;
#else
goto underlying_strftime;
diff --git a/time/strptime_l.c b/time/strptime_l.c
index 7d4758e..39cf38d 100644
--- a/time/strptime_l.c
+++ b/time/strptime_l.c
@@ -124,6 +124,8 @@ extern const struct __locale_data _nl_C_LC_TIME attribute_hidden;
(&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ABDAY_1)].string)
# define month_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (MON_1)].string)
# define ab_month_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ABMON_1)].string)
+# define alt_month_name \
+ (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ALTMON_1)].string)
# define HERE_D_T_FMT (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (D_T_FMT)].string)
# define HERE_D_FMT (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (D_FMT)].string)
# define HERE_AM_STR (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (AM_STR)].string)
@@ -319,10 +321,9 @@ __strptime_internal (const char *rp, const char *fmt, struct tm *tmp,
while (*fmt >= '0' && *fmt <= '9')
++fmt;
-#ifndef _NL_CURRENT
- /* We need this for handling the `E' modifier. */
+ /* In some cases, modifiers are handled by adjusting state and
+ then restarting the switch statement below. */
start_over:
-#endif
/* Make back up of current processing pointer. */
rp_backup = rp;
@@ -423,13 +424,32 @@ __strptime_internal (const char *rp, const char *fmt, struct tm *tmp,
ab_month_name[cnt]))
decided_longest = loc;
}
+#ifdef _LIBC
+ /* Now check the alt month. */
+ trp = rp;
+ if (match_string (_NL_CURRENT (LC_TIME, ALTMON_1 + cnt), trp)
+ && trp > rp_longest)
+ {
+ rp_longest = trp;
+ cnt_longest = cnt;
+ if (s.decided == not
+ && strcmp (_NL_CURRENT (LC_TIME, ALTMON_1 + cnt),
+ alt_month_name[cnt]))
+ decided_longest = loc;
+ }
+#endif
}
#endif
if (s.decided != loc
&& (((trp = rp, match_string (month_name[cnt], trp))
&& trp > rp_longest)
|| ((trp = rp, match_string (ab_month_name[cnt], trp))
- && trp > rp_longest)))
+ && trp > rp_longest)
+#ifdef _LIBC
+ || ((trp = rp, match_string (alt_month_name[cnt], trp))
+ && trp > rp_longest)
+#endif
+ ))
{
rp_longest = trp;
cnt_longest = cnt;
@@ -1015,6 +1035,10 @@ __strptime_internal (const char *rp, const char *fmt, struct tm *tmp,
case 'O':
switch (*fmt++)
{
+ case 'B':
+ /* Match month name. Reprocess as plain 'B'. */
+ fmt--;
+ goto start_over;
case 'd':
case 'e':
/* Match day of month using alternate numeric symbols. */
diff --git a/time/tst-strptime.c b/time/tst-strptime.c
index 34ad797..62ecb7c 100644
--- a/time/tst-strptime.c
+++ b/time/tst-strptime.c
@@ -51,6 +51,18 @@ static const struct
6, 0, 0, 1 },
{ "ja_JP.EUC-JP", "2001 20 \xb7\xee", "%Y %U %a", 1, 140, 4, 21 },
{ "ja_JP.EUC-JP", "2001 21 \xb7\xee", "%Y %W %a", 1, 140, 4, 21 },
+ /* Most of the languages do not need the declension of the month names
+ and do not distinguish between %B and %OB. */
+ { "en_US.ISO-8859-1", "November 17, 2017", "%B %e, %Y", 5, 320, 10, 17 },
+ { "de_DE.ISO-8859-1", "18. Nov 2017", "%d. %b %Y", 6, 321, 10, 18 },
+ { "fr_FR.UTF-8", "19 novembre 2017", "%d %OB %Y", 0, 322, 10, 19 },
+ /* Some languages do need the declension of the month names. */
+ { "pl_PL.UTF-8", "21 lis 2017", "%d %b %Y", 2, 324, 10, 21 },
+ { "pl_PL.UTF-8", "22 LIS 2017", "%d %B %Y", 3, 325, 10, 22 },
+ /* TODO: Use the genitive case here as soon as it is added to localedata. */
+ { "pl_PL.UTF-8", "23 listopad 2017", "%d %B %Y", 4, 326, 10, 23 },
+ /* The nominative case is incorrect here but it is parseable. */
+ { "pl_PL.UTF-8", "24 listopad 2017", "%d %OB %Y", 5, 327, 10, 24 },
};
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 74 +++++++++++++++++++++++++
NEWS | 24 ++++++++
locale/C-time.c | 52 +++++++++++++++++-
locale/categories.def | 4 ++
locale/langinfo.h | 86 ++++++++++++++++++++++++++++--
locale/programs/ld-time.c | 40 ++++++++++++++
locale/programs/locfile-kw.gperf | 2 +
locale/programs/locfile-kw.h | 112 ++++++++++++++++++++------------------
locale/programs/locfile-token.h | 2 +
localedata/locales/pl_PL | 14 +++++-
localedata/tst-langinfo.c | 12 ++++
manual/locale.texi | 26 ++++++++-
manual/time.texi | 35 +++++++++---
time/Makefile | 3 +-
time/strftime_l.c | 25 +++++++--
time/strptime_l.c | 50 ++++++++++++++++--
time/tst-strptime.c | 20 +++++++
17 files changed, 500 insertions(+), 81 deletions(-)
hooks/post-receive
--
GNU C Library master sources