mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-13 06:40:09 +00:00
8cde977077
In 2000 when date_fmt was originally added as an extension the en_US locale did not have a date_fmt specifier and so used the default which resulted in the abbreviated month name coming before the day of the month (as expected in the US and other locales). In commit7395f3a0efthe date_fmt was added to en_US with a 12H time to better align with US user expectations. Unfortunately the abbreviated month name and day were inverted during that transition, and that was seen as a regression and reported against Fedora 32: https://bugzilla.redhat.com/show_bug.cgi?id=1830623 The progression of date_fmt looks like this: "%a %b %e %H:%M:%S %Z %Y" <- Originally (2000) "%a %d %b %Y %I:%M:%S %p %Z" <- glibc 2.29 (2019) "%a %b %e %r %Z %Y" <- glibc 2.32 (2020) [this commit] Note: "%r" is "%I:%M:%S %p" in en_US and so shorter to write. Likewise the year is in the wrong place in commit7395f3a0efand this is corrected in this patch. For reference d_t_fmt: "%a %d %b %Y %r %Z" <- d_t_fmt (1997) Yes, d_t_fmt and date_fmt are *not* the same, this is just the history of this locale. This commit does not change d_t_fmt to better align with date_fmt. No users have requested we change d_t_fmt or given any justification for such a change. The only goals of this change are to place the abbreviated month name before the day of the month as it has been printed since 2000, and place the year at the end. This minimizes the change from commit7395f3a0efand makes good on changing only from 24H clock to 12H clock. Reviewed-by: Florian Weimer <fweimer@redhat.com>
178 lines
3.6 KiB
Plaintext
178 lines
3.6 KiB
Plaintext
comment_char %
|
|
escape_char /
|
|
|
|
% This file is part of the GNU C Library and contains locale data.
|
|
% The Free Software Foundation does not claim any copyright interest
|
|
% in the locale data contained in this file. The foregoing does not
|
|
% affect the license of the GNU C Library as a whole. It does not
|
|
% exempt you from the conditions of the license if your use would
|
|
% otherwise be governed by that license.
|
|
|
|
% Locale for English locale in the USA
|
|
% Contributed by Ulrich Drepper <drepper@redhat.com>, 2000
|
|
|
|
LC_IDENTIFICATION
|
|
title "English locale for the USA"
|
|
source "Free Software Foundation, Inc."
|
|
address "https:////www.gnu.org//software//libc//"
|
|
contact ""
|
|
email "bug-glibc-locales@gnu.org"
|
|
tel ""
|
|
fax ""
|
|
language "American English"
|
|
territory "United States"
|
|
revision "1.0"
|
|
date "2000-06-24"
|
|
|
|
category "i18n:2012";LC_IDENTIFICATION
|
|
category "i18n:2012";LC_CTYPE
|
|
category "i18n:2012";LC_COLLATE
|
|
category "i18n:2012";LC_TIME
|
|
category "i18n:2012";LC_NUMERIC
|
|
category "i18n:2012";LC_MONETARY
|
|
category "i18n:2012";LC_MESSAGES
|
|
category "i18n:2012";LC_PAPER
|
|
category "i18n:2012";LC_NAME
|
|
category "i18n:2012";LC_ADDRESS
|
|
category "i18n:2012";LC_TELEPHONE
|
|
category "i18n:2012";LC_MEASUREMENT
|
|
END LC_IDENTIFICATION
|
|
|
|
LC_CTYPE
|
|
copy "en_GB"
|
|
END LC_CTYPE
|
|
|
|
LC_COLLATE
|
|
|
|
% Copy the template from ISO/IEC 14651
|
|
copy "iso14651_t1"
|
|
|
|
END LC_COLLATE
|
|
|
|
LC_MONETARY
|
|
int_curr_symbol "USD "
|
|
currency_symbol "$"
|
|
mon_decimal_point "."
|
|
mon_thousands_sep ","
|
|
mon_grouping 3;3
|
|
positive_sign ""
|
|
negative_sign "-"
|
|
int_frac_digits 2
|
|
frac_digits 2
|
|
p_cs_precedes 1
|
|
int_p_sep_by_space 1
|
|
p_sep_by_space 0
|
|
n_cs_precedes 1
|
|
int_n_sep_by_space 1
|
|
n_sep_by_space 0
|
|
p_sign_posn 1
|
|
n_sign_posn 1
|
|
%
|
|
END LC_MONETARY
|
|
|
|
LC_NUMERIC
|
|
decimal_point "."
|
|
thousands_sep ","
|
|
grouping 3;3
|
|
END LC_NUMERIC
|
|
|
|
LC_TIME
|
|
abday "Sun";"Mon";"Tue";"Wed";"Thu";"Fri";"Sat"
|
|
day "Sunday";/
|
|
"Monday";/
|
|
"Tuesday";/
|
|
"Wednesday";/
|
|
"Thursday";/
|
|
"Friday";/
|
|
"Saturday"
|
|
|
|
week 7;19971130;1
|
|
abmon "Jan";"Feb";/
|
|
"Mar";"Apr";/
|
|
"May";"Jun";/
|
|
"Jul";"Aug";/
|
|
"Sep";"Oct";/
|
|
"Nov";"Dec"
|
|
mon "January";/
|
|
"February";/
|
|
"March";/
|
|
"April";/
|
|
"May";/
|
|
"June";/
|
|
"July";/
|
|
"August";/
|
|
"September";/
|
|
"October";/
|
|
"November";/
|
|
"December"
|
|
% Appropriate date and time representation (%c)
|
|
d_t_fmt "%a %d %b %Y %r %Z"
|
|
%
|
|
% Appropriate date representation (%x)
|
|
d_fmt "%m//%d//%Y"
|
|
%
|
|
% Appropriate time representation (%X)
|
|
t_fmt "%r"
|
|
%
|
|
% Appropriate AM/PM time representation (%r)
|
|
t_fmt_ampm "%I:%M:%S %p"
|
|
%
|
|
% Appropriate date and time representation for date(1). This is
|
|
% different from d_t_fmt for historical reasons and has been different
|
|
% since 2000 when date_fmt was added as a GNU extension. At the end
|
|
% of 2018 it was adjusted to use 12H time (bug 24046) instead of 24H.
|
|
date_fmt "%a %b %e %r %Z %Y"
|
|
%
|
|
% Strings for AM/PM
|
|
%
|
|
am_pm "AM";"PM"
|
|
END LC_TIME
|
|
|
|
LC_MESSAGES
|
|
yesexpr "^[+1yY]"
|
|
noexpr "^[-0nN]"
|
|
yesstr "yes"
|
|
nostr "no"
|
|
END LC_MESSAGES
|
|
|
|
LC_PAPER
|
|
height 279
|
|
width 216
|
|
END LC_PAPER
|
|
|
|
LC_NAME
|
|
name_fmt "%d%t%g%t%m%t%f"
|
|
name_miss "Miss."
|
|
name_mr "Mr."
|
|
name_mrs "Mrs."
|
|
name_ms "Ms."
|
|
END LC_NAME
|
|
|
|
|
|
LC_ADDRESS
|
|
postal_fmt "%a%N%f%N%d%N%b%N%h %s %e %r%N%T, %S %z%N%c%N"
|
|
country_name "United States"
|
|
country_post "USA"
|
|
country_ab2 "US"
|
|
country_ab3 "USA"
|
|
country_num 840
|
|
country_car "USA"
|
|
country_isbn 0
|
|
lang_name "English"
|
|
lang_ab "en"
|
|
lang_term "eng"
|
|
lang_lib "eng"
|
|
END LC_ADDRESS
|
|
|
|
LC_TELEPHONE
|
|
tel_int_fmt "+%c (%a) %l"
|
|
tel_dom_fmt "(%a) %l"
|
|
int_select "11"
|
|
int_prefix "1"
|
|
END LC_TELEPHONE
|
|
|
|
LC_MEASUREMENT
|
|
% US customary units.
|
|
measurement 2
|
|
END LC_MEASUREMENT
|