summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTAMUKI Shoichi <tamuki@linet.gr.jp>2019-04-02 16:46:55 +0900
committerAndreas K. Hüttel <dilfridge@gentoo.org>2019-04-07 17:57:48 +0200
commite2b2a485d3aea7ae0a183c25f1bc0a7b8f9f43c3 (patch)
treeeb78968d54237dc1be40c80dccbc337a58e125a0
parentja_JP: Change the offset for Taisho gan-nen from 2 to 1 [BZ #24162] (diff)
downloadglibc-e2b2a485d3aea7ae0a183c25f1bc0a7b8f9f43c3.tar.gz
glibc-e2b2a485d3aea7ae0a183c25f1bc0a7b8f9f43c3.tar.bz2
glibc-e2b2a485d3aea7ae0a183c25f1bc0a7b8f9f43c3.zip
ja_JP locale: Add entry for the new Japanese era [BZ #22964]gentoo/glibc-2.29-3
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) (cherry picked from commit 0941350c20a52447e53c5169354408e3db591f73) Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
-rw-r--r--ChangeLog6
-rw-r--r--NEWS4
-rw-r--r--localedata/locales/ja_JP4
3 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 048ca9644c..3b5d24cf67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-04-02 TAMUKI Shoichi <tamuki@linet.gr.jp>
+
+ [BZ #22964]
+ * localedata/locales/ja_JP (LC_TIME): Add entry for the new Japanese
+ era.
+
2019-03-02 TAMUKI Shoichi <tamuki@linet.gr.jp>
[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 "<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>";/