From: TAMUKI Shoichi <tamuki@linet.gr.jp>
Date: Wed, 3 Apr 2019 22:23:14 +0000 (-0400)
Subject: ja_JP locale: Add entry for the new Japanese era [BZ #22964]
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7423da211d1490d9fc76c2f0ce49e5dd90ea9bcc;p=thirdparty%2Fglibc.git

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)
---

diff --git a/ChangeLog b/ChangeLog
index fd2be02484b..dd02102d5f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-04-03  TAMUKI Shoichi  <tamuki@linet.gr.jp>
+
+	[BZ #22964]
+	* localedata/locales/ja_JP (LC_TIME): Add entry for the new Japanese
+	era.
+
 2019-03-21  Stefan Liebler  <stli@linux.ibm.com>
 
 	* sysdeps/s390/dl-procinfo.h (HWCAP_IMPORTANT):
diff --git a/NEWS b/NEWS
index f4981a16f08..17b50c7a23f 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,10 @@ using `glibc' in the "product" field.
 
 Version 2.28.1
 
+Major new features:
+
+* The entry for the new Japanese era has been added for ja_JP locale.
+
 Deprecated and removed features, and other changes affecting compatibility:
 
 * For powercp64le ABI, Transactional Lock Elision is now enabled iff kernel
diff --git a/localedata/locales/ja_JP b/localedata/locales/ja_JP
index 1fd2fee44b2..30190b62485 100644
--- a/localedata/locales/ja_JP
+++ b/localedata/locales/ja_JP
@@ -14946,7 +14946,9 @@ am_pm	"<U5348><U524D>";"<U5348><U5F8C>"
 
 t_fmt_ampm "%p%I<U6642>%M<U5206>%S<U79D2>"
 
-era	"+:2:1990//01//01:+*:<U5E73><U6210>:%EC%Ey<U5E74>";/
+era	"+:2:2020//01//01:+*:<U4EE4><U548C>:%EC%Ey<U5E74>";/
+	"+:1:2019//05//01:2019//12//31:<U4EE4><U548C>:%EC<U5143><U5E74>";/
+	"+:2:1990//01//01:2019//04//30:<U5E73><U6210>:%EC%Ey<U5E74>";/
 	"+:1:1989//01//08:1989//12//31:<U5E73><U6210>:%EC<U5143><U5E74>";/
 	"+:2:1927//01//01:1989//01//07:<U662D><U548C>:%EC%Ey<U5E74>";/
 	"+:1:1926//12//25:1926//12//31:<U662D><U548C>:%EC<U5143><U5E74>";/