diff options
| author | Nikita Iashchenko <nikitai@google.com> | 2019-04-09 16:19:04 +0100 |
|---|---|---|
| committer | Nikita Iashchenko <nikitai@google.com> | 2019-04-25 13:28:40 +0100 |
| commit | 9cd16e6b2c9de5abcf35495c94d92772004f9711 (patch) | |
| tree | 3fdca80d18365a8fd5dc0e4aa90023232772726d | |
| parent | dc8dafd81a6a2f6c5197cc6de8869d2741862d8a (diff) | |
| download | android_external_cldr-9cd16e6b2c9de5abcf35495c94d92772004f9711.tar.gz android_external_cldr-9cd16e6b2c9de5abcf35495c94d92772004f9711.tar.bz2 android_external_cldr-9cd16e6b2c9de5abcf35495c94d92772004f9711.zip | |
Cherry-pick: changeset-14976 Japanese/root data for Japanse era Reiwa (2019-05-01 -)
Upstream bug: https://unicode.org/cldr/trac/ticket/11796
Changeset: https://unicode.org/cldr/trac/changeset/14976
Bug: 77858319
Test: external/icu/tools/udpatecldrdata.py
Change-Id: Id3524bc1cc947edb112b3459072cdbd1caddb10f
Merged-In: Id3524bc1cc947edb112b3459072cdbd1caddb10f
(cherry picked from commit cbbb30140b9b997ca13cf86ffe4b0331b767c502)
| -rw-r--r-- | common/main/ja.xml | 4 | ||||
| -rw-r--r-- | common/main/root.xml | 4 | ||||
| -rw-r--r-- | common/supplemental/supplementalData.xml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/common/main/ja.xml b/common/main/ja.xml index 66c6b82..74479ab 100644 --- a/common/main/ja.xml +++ b/common/main/ja.xml @@ -3728,7 +3728,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ <era type="233">大正</era> <era type="234">昭和</era> <era type="235">平成</era> - <era type="236">ＱＱ</era> + <era type="236">令和</era> </eraAbbr> <eraNarrow> <era type="0">大化</era> @@ -3967,7 +3967,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ <era type="233">T</era> <era type="234">S</era> <era type="235">H</era> - <era type="236">Q</era> + <era type="236">R</era> </eraNarrow> </eras> <dateFormats> diff --git a/common/main/root.xml b/common/main/root.xml index 0c58e3c..a899b61 100644 --- a/common/main/root.xml +++ b/common/main/root.xml @@ -2111,7 +2111,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ <era type="233">Taishō</era> <era type="234">Shōwa</era> <era type="235">Heisei</era> - <era type="236">Qqqq</era> + <era type="236">Reiwa</era> </eraAbbr> <eraNarrow> <era type="0">Taika (645–650)</era> @@ -2350,7 +2350,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ <era type="233">T</era> <era type="234">S</era> <era type="235">H</era> - <era type="236">Q</era> + <era type="236">R</era> </eraNarrow> </eras> <dateFormats> diff --git a/common/supplemental/supplementalData.xml b/common/supplemental/supplementalData.xml index d643049..8b5f01f 100644 --- a/common/supplemental/supplementalData.xml +++ b/common/supplemental/supplementalData.xml @@ -4536,7 +4536,7 @@ XXX Code for transations where no currency is involved <era type="233" start="1912-7-30"/> <era type="234" start="1926-12-25"/> <era type="235" start="1989-1-8"/> - <era type="236" start="2019-5-1" named="false"/> + <era type="236" start="2019-5-1"/> </eras> </calendar> <calendar type="islamic"> |