diff options
author | Carlos O'Donell <carlos@redhat.com> | 2022-01-31 00:34:42 -0500 |
---|---|---|
committer | Carlos O'Donell <carlos@redhat.com> | 2022-02-01 11:12:36 -0500 |
commit | 7e0ad15c0fbfe25435c1acd0ed3e9cedfbff2488 (patch) | |
tree | cc895d67bf23e6fc6b18afbaa8a2a3c5eb822fba /localedata/locales/C | |
parent | 1d8e3a2c6636cf0b1b8fa2f869cef6ec10726933 (diff) | |
download | glibc-7e0ad15c0fbfe25435c1acd0ed3e9cedfbff2488.tar.gz glibc-7e0ad15c0fbfe25435c1acd0ed3e9cedfbff2488.tar.xz glibc-7e0ad15c0fbfe25435c1acd0ed3e9cedfbff2488.zip |
localedata: Adjust C.UTF-8 to align with C/POSIX.
We have had one downstream report from Canonical [1] that an rrdtool test was broken by the differences in LC_TIME that we had in the non-builtin C locale (C.UTF-8). If one application has an issue there are going to be others, and so with this commit we review and fix all the issues that cause the builtin C locale to be different from C.UTF-8, which includes: * mon_decimal_point should be empty e.g. "" - Depends on mon_decimal_point_wc fix. * negative_sign should be empty e.g. "" * week should be aligned with the builtin C/POSIX locale * d_fmt corrected with escaped slashes e.g. "%m//%d//%y" * yesstr and nostr should be empty e.g. "" * country_ab2 and country_ab3 should be empty e.g. "" We bump LC_IDENTIFICATION version and adjust the date to indicate the change in the locale. A new tst-c-utf8-consistency test is added to ensure consistency between C/POSIX and C.UTF-8. Tested on x86_64 and i686 without regression. [1] https://sourceware.org/pipermail/libc-alpha/2022-January/135703.html Co-authored-by: Florian Weimer <fweimer@redhat.com> Reviewed-by: Florian Weimer <fweimer@redhat.com>
Diffstat (limited to 'localedata/locales/C')
-rw-r--r-- | localedata/locales/C | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/localedata/locales/C b/localedata/locales/C index ca801c79cf..fc0614e551 100644 --- a/localedata/locales/C +++ b/localedata/locales/C @@ -12,8 +12,8 @@ tel "" fax "" language "" territory "" -revision "2.0" -date "2020-06-28" +revision "2.1" +date "2022-01-30" category "i18n:2012";LC_IDENTIFICATION category "i18n:2012";LC_CTYPE category "i18n:2012";LC_COLLATE @@ -68,11 +68,11 @@ LC_MONETARY % glibc/locale/C-monetary.c.). int_curr_symbol "" currency_symbol "" -mon_decimal_point "." +mon_decimal_point "" mon_thousands_sep "" mon_grouping -1 positive_sign "" -negative_sign "-" +negative_sign "" int_frac_digits -1 frac_digits -1 p_cs_precedes -1 @@ -121,7 +121,9 @@ mon "January";"February";"March";"April";"May";"June";"July";/ % % ISO 8601 conforming applications should use the values 7, 19971201 (a % Monday), and 4 (Thursday), respectively. -week 7;19971201;4 +% +% This field is consciously aligned with the builtin C/POSIX locale. +week 7;19971130;4 first_weekday 1 first_workday 2 @@ -129,7 +131,7 @@ first_workday 2 d_t_fmt "%a %b %e %H:%M:%S %Y" % Appropriate date representation (%x) -d_fmt "%m/%d/%y" +d_fmt "%m//%d//%y" % Appropriate time representation (%X) t_fmt "%H:%M:%S" @@ -150,8 +152,8 @@ LC_MESSAGES % yesexpr "^[yY]" noexpr "^[nN]" -yesstr "Yes" -nostr "No" +yesstr "" +nostr "" END LC_MESSAGES LC_PAPER @@ -175,6 +177,10 @@ LC_ADDRESS % the LC_ADDRESS category. % (also used in the built in C/POSIX locale in glibc/locale/C-address.c) postal_fmt "%a%N%f%N%d%N%b%N%s %h %e %r%N%C-%z %T%N%c%N" +% The abbreviated 2 char and 3 char should be set to empty strings to +% match the C/POSIX locale. +country_ab2 "" +country_ab3 "" END LC_ADDRESS LC_TELEPHONE |