From 03354a2102443c3e0c2208c3aac087e357b01054 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 24 Feb 2025 08:34:15 +0100 Subject: [PATCH] nl_langinfo: Fix support of abbreviated alternative month names. * lib/nl_langinfo.c (rpl_nl_langinfo): Treat ABALTMON_i like ABMON_i. --- ChangeLog | 5 +++++ lib/nl_langinfo.c | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/ChangeLog b/ChangeLog index 4453b26db4..e302971949 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2025-02-24 Bruno Haible + + nl_langinfo: Fix support of abbreviated alternative month names. + * lib/nl_langinfo.c (rpl_nl_langinfo): Treat ABALTMON_i like ABMON_i. + 2025-02-24 Bruno Haible strerror_l tests: Fix link error. diff --git a/lib/nl_langinfo.c b/lib/nl_langinfo.c index f2a177cbd8..b87066bbfd 100644 --- a/lib/nl_langinfo.c +++ b/lib/nl_langinfo.c @@ -317,6 +317,24 @@ rpl_nl_langinfo (nl_item item) item = item - ALTMON_1 + MON_1; break; # endif +# if GNULIB_defined_ABALTMON + case ABALTMON_1: + case ABALTMON_2: + case ABALTMON_3: + case ABALTMON_4: + case ABALTMON_5: + case ABALTMON_6: + case ABALTMON_7: + case ABALTMON_8: + case ABALTMON_9: + case ABALTMON_10: + case ABALTMON_11: + case ABALTMON_12: + /* We don't ship the appropriate localizations with gnulib. Therefore, + treat ABALTMON_i like ABMON_i. */ + item = item - ABALTMON_1 + ABMON_1; + break; +# endif # if GNULIB_defined_ERA case ERA: /* The format is not standardized. In glibc it is a sequence of strings -- 2.39.5