about summary refs log tree commit diff
path: root/localedata
diff options
context:
space:
mode:
authorTAMUKI Shoichi <tamuki@linet.gr.jp>2019-04-02 16:46:55 +0900
committerTAMUKI Shoichi <tamuki@linet.gr.jp>2019-04-02 16:46:55 +0900
commit466afec30896585b60c2106df7a722a86247c9f3 (patch)
tree30e2ea30761f5bc47ca6324210e9a5b66fd93670 /localedata
parent84aea16929f310625a52bf9c3db3341f56970ab0 (diff)
downloadglibc-466afec30896585b60c2106df7a722a86247c9f3.tar.gz
glibc-466afec30896585b60c2106df7a722a86247c9f3.tar.xz
glibc-466afec30896585b60c2106df7a722a86247c9f3.zip
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.

Checked on x86_64-linux-gnu.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>

ChangeLog:

	[BZ #22964]
	* localedata/locales/ja_JP (LC_TIME): Add entry for the new Japanese
	era.
	* time/tst-strftime2.c (dates): Add 2019-04-30 and 2019-05-01.
	(mkreftable): Add rules for the new Japanese era and the new dates.
Diffstat (limited to 'localedata')
-rw-r--r--localedata/locales/ja_JP6
1 files changed, 4 insertions, 2 deletions
diff --git a/localedata/locales/ja_JP b/localedata/locales/ja_JP
index cb51e6d69d..c727997b6b 100644
--- a/localedata/locales/ja_JP
+++ b/localedata/locales/ja_JP
@@ -14952,7 +14952,7 @@ t_fmt_ampm "%p%I<U6642>%M<U5206>%S<U79D2>"
 %
 % The following dates and their names are recorded below in descending
 % date order (note that <U5E74> or <NEN> follows each date).
-% <HEISEI> -> <SHOWA> -> <TAISHO> -> <MEIJI> -> <AD> -> <BC>
+% <REIWA> -> <HEISEI> -> <SHOWA> -> <TAISHO> -> <MEIJI> -> <AD> -> <BC>
 %
 % Each string is an era description segment with the format:
 % "direction:offset:start_date:end_date:era_name:era_format"
@@ -14964,7 +14964,9 @@ t_fmt_ampm "%p%I<U6642>%M<U5206>%S<U79D2>"
 % - The last entry <U7D00><U5143><U524D> in era_name means BC.
 % - The second-to-last entry <U897F><U66A6> in era_name means AD.
 %
-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>";/