From 0941350c20a52447e53c5169354408e3db591f73 Mon Sep 17 00:00:00 2001 From: TAMUKI Shoichi Date: Tue, 2 Apr 2019 16:46:55 +0900 Subject: [PATCH 12] ja_JP locale: Add entry for the new Japanese era [BZ #22964] The Japanese era name will be changed on May 1, 2019. The Japanese government made a preliminary announcement on April 1, 2019. The glibc ja_JP locale must be updated to include the new era name for strftime's alternative year format support. This is a minimal cherry pick of just the required locale changes. (cherry picked from commit 466afec30896585b60c2106df7a722a86247c9f3) --- ChangeLog | 6 ++++++ NEWS | 4 ++++ localedata/locales/ja_JP | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 048ca9644c..3b5d24cf67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2019-04-02 TAMUKI Shoichi + + [BZ #22964] + * localedata/locales/ja_JP (LC_TIME): Add entry for the new Japanese + era. + 2019-03-02 TAMUKI Shoichi [BZ #24162] diff --git a/NEWS b/NEWS index 271bf7a2cd..703864ac75 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,10 @@ using `glibc' in the "product" field. Version 2.29.1 +Major new features: + +* The entry for the new Japanese era has been added for ja_JP locale. + The following bugs are resolved with this release: [24155] x32 memcmp can treat positive length as 0 (if sign bit in RDX is set) (CVE-2019-7309) diff --git a/localedata/locales/ja_JP b/localedata/locales/ja_JP index 9bfbb2bb9b..c64aaaff55 100644 --- a/localedata/locales/ja_JP +++ b/localedata/locales/ja_JP @@ -14946,7 +14946,9 @@ am_pm "";"" t_fmt_ampm "%p%I%M%S" -era "+:2:1990//01//01:+*::%EC%Ey";/ +era "+:2:2020//01//01:+*::%EC%Ey";/ + "+:1:2019//05//01:2019//12//31::%EC";/ + "+:2:1990//01//01:2019//04//30::%EC%Ey";/ "+:1:1989//01//08:1989//12//31::%EC";/ "+:2:1927//01//01:1989//01//07::%EC%Ey";/ "+:1:1926//12//25:1926//12//31::%EC";/