diff options
author | Nikita Iashchenko <nikitai@google.com> | 2019-04-09 17:51:29 +0100 |
---|---|---|
committer | Nikita Iashchenko <nikitai@google.com> | 2019-04-25 13:29:28 +0100 |
commit | 1a85e3902da68636ec8ae978935ef144b7ac0840 (patch) | |
tree | 1692b3522c045f7dafb78ac41aafaccfc289a098 | |
parent | 9cd16e6b2c9de5abcf35495c94d92772004f9711 (diff) | |
download | cldr-1a85e3902da68636ec8ae978935ef144b7ac0840.tar.gz |
Cherry-pick: changeset 14981 Add more Japan new era localized names, remove placeholdersandroid-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release
This CL cherry-picks all changes from upstream commit except the third
line in zh.xml (dropping line 4552 "<era type="236" draft="contributed">R</era>"
from the patch).
This is done because:
a) In Android copy of zh.xml under <eraNarrow> array we have eras with
numbers up to 162, so that the last entry is
"<era type="162" draft="contributed">天授(1375–1379)</era>" and the
mentioned above hunk can't be appled there. We also do not have any
narrow forms of recent eras there.
b) Even if we apply this hunk, we still will not have any changes in
ICU data, so this hunk can be safely ignored.
Upstream bug: https://unicode.org/cldr/trac/ticket/11969
Changeset: https://unicode.org/cldr/trac/changeset/14981
Bug: 77858319
Test: external/icu/tools/udpatecldrdata.py
Change-Id: I2016ec21a4f8b3e99b3392d2b2aebfbcc92be164
Merged-In: I2016ec21a4f8b3e99b3392d2b2aebfbcc92be164
(cherry picked from commit 40d7c12ce7a27dca5f41f0b639819416913e5b18)
-rw-r--r-- | common/main/ar.xml | 1 | ||||
-rw-r--r-- | common/main/bs_Cyrl.xml | 1 | ||||
-rw-r--r-- | common/main/el.xml | 6 | ||||
-rw-r--r-- | common/main/fa.xml | 8 | ||||
-rw-r--r-- | common/main/hi.xml | 1 | ||||
-rw-r--r-- | common/main/ko.xml | 1 | ||||
-rw-r--r-- | common/main/ru.xml | 1 | ||||
-rw-r--r-- | common/main/sr.xml | 1 | ||||
-rw-r--r-- | common/main/sr_Latn.xml | 1 | ||||
-rw-r--r-- | common/main/th.xml | 1 | ||||
-rw-r--r-- | common/main/uk.xml | 3 | ||||
-rw-r--r-- | common/main/yue.xml | 1 | ||||
-rw-r--r-- | common/main/yue_Hans.xml | 1 | ||||
-rw-r--r-- | common/main/zh.xml | 2 | ||||
-rw-r--r-- | common/main/zh_Hant.xml | 3 |
15 files changed, 31 insertions, 1 deletions
diff --git a/common/main/ar.xml b/common/main/ar.xml index 82d2d8da..c7a56961 100644 --- a/common/main/ar.xml +++ b/common/main/ar.xml @@ -2524,6 +2524,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" draft="contributed">ريوا</era> </eraAbbr> </eras> </calendar> diff --git a/common/main/bs_Cyrl.xml b/common/main/bs_Cyrl.xml index 19c0b9a1..e409c651 100644 --- a/common/main/bs_Cyrl.xml +++ b/common/main/bs_Cyrl.xml @@ -1932,6 +1932,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic <era type="233">Таишо</era> <era type="234">Шова</era> <era type="235">Хаисеи</era> + <era type="236" draft="contributed">Реива</era> </eraAbbr> </eras> <dateFormats> diff --git a/common/main/el.xml b/common/main/el.xml index 1d27fc47..8bf7ca13 100644 --- a/common/main/el.xml +++ b/common/main/el.xml @@ -2478,6 +2478,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ </eras> </calendar> <calendar type="japanese"> + <eras> + <eraAbbr> + <era type="235" draft="contributed">Χεϊσέι</era> + <era type="236" draft="contributed">Ρέιβα</era> + </eraAbbr> + </eras> <dateFormats> <dateFormatLength type="full"> <dateFormat> diff --git a/common/main/fa.xml b/common/main/fa.xml index f20ccf18..69e73e8d 100644 --- a/common/main/fa.xml +++ b/common/main/fa.xml @@ -2460,6 +2460,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ </availableFormats> </dateTimeFormats> </calendar> + <calendar type="japanese"> + <eras> + <eraAbbr> + <era type="235" draft="contributed">هیسهای</era> + <era type="236" draft="contributed">ریوا</era> + </eraAbbr> + </eras> + </calendar> <calendar type="persian"> <months> <monthContext type="format"> diff --git a/common/main/hi.xml b/common/main/hi.xml index 1974d9e0..b0bcd7f0 100644 --- a/common/main/hi.xml +++ b/common/main/hi.xml @@ -2247,6 +2247,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ <era type="233" draft="contributed">ताईशो</era> <era type="234" draft="contributed">शोवा</era> <era type="235" draft="contributed">हेईसेई</era> + <era type="236" draft="contributed">रेइवा</era> </eraAbbr> </eras> </calendar> diff --git a/common/main/ko.xml b/common/main/ko.xml index 9ef1f17b..670d15f3 100644 --- a/common/main/ko.xml +++ b/common/main/ko.xml @@ -3087,6 +3087,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" draft="contributed">레이와</era> </eraAbbr> </eras> <dateTimeFormats> diff --git a/common/main/ru.xml b/common/main/ru.xml index 565952da..6a8cc142 100644 --- a/common/main/ru.xml +++ b/common/main/ru.xml @@ -2942,6 +2942,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" draft="contributed">Рэйва</era> </eraAbbr> </eras> </calendar> diff --git a/common/main/sr.xml b/common/main/sr.xml index 22c659a2..8cdc7b34 100644 --- a/common/main/sr.xml +++ b/common/main/sr.xml @@ -2280,6 +2280,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" draft="contributed">Реива</era> </eraAbbr> </eras> <dateFormats> diff --git a/common/main/sr_Latn.xml b/common/main/sr_Latn.xml index cf55b886..f8ac764b 100644 --- a/common/main/sr_Latn.xml +++ b/common/main/sr_Latn.xml @@ -2279,6 +2279,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic <era type="233">Taišo</era> <era type="234">Šova</era> <era type="235">Haisei</era> + <era type="236" draft="contributed">Reiva</era> </eraAbbr> </eras> <dateFormats> diff --git a/common/main/th.xml b/common/main/th.xml index 142edb6c..d8bc5274 100644 --- a/common/main/th.xml +++ b/common/main/th.xml @@ -3570,6 +3570,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" draft="contributed">เรวะ</era> </eraAbbr> </eras> <dateFormats> diff --git a/common/main/uk.xml b/common/main/uk.xml index ac08cf9e..28ff7d0d 100644 --- a/common/main/uk.xml +++ b/common/main/uk.xml @@ -2714,7 +2714,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ <era type="232" draft="provisional">Мейдзі</era> <era type="233" draft="provisional">Тайсьо</era> <era type="234" draft="provisional">Сьова</era> - <era type="235" draft="provisional">Хейсей</era> + <era type="235" draft="contributed">Хейсей</era> + <era type="236" draft="contributed">Рейва</era> </eraAbbr> </eras> </calendar> diff --git a/common/main/yue.xml b/common/main/yue.xml index d19152c1..c4aab285 100644 --- a/common/main/yue.xml +++ b/common/main/yue.xml @@ -3519,6 +3519,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic <era type="233">大正</era> <era type="234">昭和</era> <era type="235">平成</era> + <era type="236">令和</era> </eraAbbr> </eras> <dateFormats> diff --git a/common/main/yue_Hans.xml b/common/main/yue_Hans.xml index 175b4c46..2461ae14 100644 --- a/common/main/yue_Hans.xml +++ b/common/main/yue_Hans.xml @@ -3520,6 +3520,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic <era type="233">大正</era> <era type="234">昭和</era> <era type="235">平成</era> + <era type="236">令和</era> </eraAbbr> </eras> <dateFormats> diff --git a/common/main/zh.xml b/common/main/zh.xml index 4994d85a..55107813 100644 --- a/common/main/zh.xml +++ b/common/main/zh.xml @@ -3989,6 +3989,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ <era type="233" draft="contributed">大正</era> <era type="234" draft="contributed">昭和</era> <era type="235" draft="contributed">平成</era> + <era type="236" draft="contributed">令和</era> </eraNames> <eraAbbr> <era type="0">大化 (645–650)</era> @@ -4227,6 +4228,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> </eraAbbr> <eraNarrow> <era type="0">大化(645–650)</era> diff --git a/common/main/zh_Hant.xml b/common/main/zh_Hant.xml index 94553589..5a6b2d3e 100644 --- a/common/main/zh_Hant.xml +++ b/common/main/zh_Hant.xml @@ -5974,6 +5974,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ <era type="233" draft="contributed">大正</era> <era type="234" draft="contributed">昭和</era> <era type="235" draft="contributed">平成</era> + <era type="236" draft="contributed">令和</era> </eraNames> <!-- per cldrbug 2835, accept provisional --> <eraAbbr> @@ -6213,6 +6214,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> </eraAbbr> <eraNarrow> <era type="0" draft="contributed">大化</era> @@ -6451,6 +6453,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ <era type="233" draft="contributed">大正</era> <era type="234" draft="contributed">昭和</era> <era type="235" draft="contributed">平成</era> + <era type="236" draft="contributed">令和</era> </eraNarrow> </eras> <dateFormats> |