forked from rpms/glibc
206 lines
4.8 KiB
Diff
206 lines
4.8 KiB
Diff
Bug RHEL #2000374
|
|
Bugs Upstream #24046, #25923
|
|
|
|
This patch provides 12-hour time for the English language UTF-8 locale as a
|
|
new locale en_US@ampm.UTF-8.
|
|
|
|
Two upstream commits were applied to en_US to create the new file en_US@ampm:
|
|
Upstream commit: 7395f3a0efad9fc51bb54fa383ef6524702e0c49
|
|
Upstream commit: 8cde977077b3568310c743b21a905ca9ab286724
|
|
|
|
en_US remains unchanged and the new file en_US@ampm is now supported.
|
|
|
|
|
|
diff -Nrup a/localedata/locales/en_US@ampm b/localedata/locales/en_US@ampm
|
|
--- a/localedata/locales/en_US@ampm 1969-12-31 19:00:00.000000000 -0500
|
|
+++ b/localedata/locales/en_US@ampm 2021-11-17 17:19:15.338720307 -0500
|
|
@@ -0,0 +1,177 @@
|
|
+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 "http:////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
|
|
diff -Nrup a/localedata/SUPPORTED b/localedata/SUPPORTED
|
|
--- a/localedata/SUPPORTED 2021-11-17 17:14:33.831631483 -0500
|
|
+++ b/localedata/SUPPORTED 2021-11-17 17:21:16.418188595 -0500
|
|
@@ -159,6 +159,7 @@ en_SG/ISO-8859-1 \
|
|
en_US.UTF-8/UTF-8 \
|
|
en_US/ISO-8859-1 \
|
|
en_US.ISO-8859-15/ISO-8859-15 \
|
|
+en_US@ampm.UTF-8/UTF-8 \
|
|
en_ZA.UTF-8/UTF-8 \
|
|
en_ZA/ISO-8859-1 \
|
|
en_ZM/UTF-8 \
|