diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-12-16 21:19:30 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-12-16 21:19:30 +0100 |
| commit | 10f1958417a4944a60a08230eae6a639209d52f8 (patch) | |
| tree | 7662166d1cf40507e65fba6dbb9ee73a7c652afc /localedata/locales/ja_JP | |
| parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) | |
| parent | a2e487ce1c59d19345d9ecacc58de79febd869e4 (diff) | |
Merge branch 'master' of git://sourceware.org/git/glibc into upstreamupstream
Diffstat (limited to 'localedata/locales/ja_JP')
| -rw-r--r-- | localedata/locales/ja_JP | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/localedata/locales/ja_JP b/localedata/locales/ja_JP index 1fd2fee44b..c727997b6b 100644 --- a/localedata/locales/ja_JP +++ b/localedata/locales/ja_JP @@ -14946,12 +14946,32 @@ 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>";/ +% The era names are laid out in groups of 2 to account for the desire +% to avoid using '1' for the first era year. Instead of '1' we use +% <U5143> or <GAN> as the first era year. +% +% The following dates and their names are recorded below in descending +% date order (note that <U5E74> or <NEN> follows each date). +% <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" +% +% Note: +% - The '+*' entry in end_date means "forever going forward" +% - The '-*' entry in end_date means "forever going backwards" counting up. +% - Negative year number in start_date is prior to AD 1 (BC) counting up. +% - 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: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>";/ "+:2:1913//01//01:1926//12//24:<U5927><U6B63>:%EC%Ey<U5E74>";/ - "+:2:1912//07//30:1912//12//31:<U5927><U6B63>:%EC<U5143><U5E74>";/ + "+:1:1912//07//30:1912//12//31:<U5927><U6B63>:%EC<U5143><U5E74>";/ "+:6:1873//01//01:1912//07//29:<U660E><U6CBB>:%EC%Ey<U5E74>";/ "+:1:0001//01//01:1872//12//31:<U897F><U66A6>:%EC%Ey<U5E74>";/ "+:1:-0001//12//31:-*:<U7D00><U5143><U524D>:%EC%Ey<U5E74>" |