diff options
| author | Almaz Mingaleev <mingaleev@google.com> | 2021-01-28 16:27:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-28 16:27:13 +0000 |
| commit | 00dc56796c1da6c05ee7470466fea0c9f7994a24 (patch) | |
| tree | 84c6e32f1ead811535eb954e062002fc1dbe22ad | |
| parent | dfde7c998d1386c939e76b08ac3a01d421db9a8b (diff) | |
| parent | c4cd4dbb9fccb89096c722428ea1070e962ae6d8 (diff) | |
| download | cldr-00dc56796c1da6c05ee7470466fea0c9f7994a24.tar.gz | |
Cherry-pick CLDR-14434: Update Android CLDR tzdata from 2020f to 2021a. am: ca575a91c9 am: c4cd4dbb9f
Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1562975
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I26610c3f733e718cb9b2b544c0a63195bb4b8d69
| -rw-r--r-- | common/supplemental/metaZones.xml | 3 | ||||
| -rw-r--r-- | common/supplemental/windowsZones.xml | 4 | ||||
| -rw-r--r-- | tools/java/org/unicode/cldr/util/data/africa | 8 | ||||
| -rw-r--r-- | tools/java/org/unicode/cldr/util/data/tzdb-version.txt | 2 |
4 files changed, 12 insertions, 5 deletions
diff --git a/common/supplemental/metaZones.xml b/common/supplemental/metaZones.xml index 9d735682..347a5321 100644 --- a/common/supplemental/metaZones.xml +++ b/common/supplemental/metaZones.xml @@ -95,7 +95,8 @@ For terms of use, see http://www.unicode.org/copyright.html </timezone> <timezone type="Africa/Juba"> <usesMetazone to="2000-01-15 10:00" mzone="Africa_Central"/> - <usesMetazone from="2000-01-15 10:00" mzone="Africa_Eastern"/> + <usesMetazone to="2021-01-31 21:00" from="2000-01-15 10:00" mzone="Africa_Eastern"/> + <usesMetazone from="2021-01-31 21:00" mzone="Africa_Central"/> </timezone> <timezone type="Africa/Kampala"> <usesMetazone mzone="Africa_Eastern"/> diff --git a/common/supplemental/windowsZones.xml b/common/supplemental/windowsZones.xml index 3316f19c..fd2ccb6d 100644 --- a/common/supplemental/windowsZones.xml +++ b/common/supplemental/windowsZones.xml @@ -9,7 +9,7 @@ For terms of use, see http://www.unicode.org/copyright.html <supplementalData> <version number="$Revision$"/> <windowsZones> - <mapTimezones otherVersion="7e11800" typeVersion="2020f"> + <mapTimezones otherVersion="7e11800" typeVersion="2021a"> <!-- (UTC-12:00) International Date Line West --> <mapZone other="Dateline Standard Time" territory="001" type="Etc/GMT+12"/> @@ -406,6 +406,7 @@ For terms of use, see http://www.unicode.org/copyright.html <mapZone other="South Africa Standard Time" territory="MW" type="Africa/Blantyre"/> <mapZone other="South Africa Standard Time" territory="MZ" type="Africa/Maputo"/> <mapZone other="South Africa Standard Time" territory="RW" type="Africa/Kigali"/> + <mapZone other="South Africa Standard Time" territory="SS" type="Africa/Juba"/> <mapZone other="South Africa Standard Time" territory="SZ" type="Africa/Mbabane"/> <mapZone other="South Africa Standard Time" territory="ZA" type="Africa/Johannesburg"/> <mapZone other="South Africa Standard Time" territory="ZM" type="Africa/Lusaka"/> @@ -477,7 +478,6 @@ For terms of use, see http://www.unicode.org/copyright.html <mapZone other="E. Africa Standard Time" territory="KM" type="Indian/Comoro"/> <mapZone other="E. Africa Standard Time" territory="MG" type="Indian/Antananarivo"/> <mapZone other="E. Africa Standard Time" territory="SO" type="Africa/Mogadishu"/> - <mapZone other="E. Africa Standard Time" territory="SS" type="Africa/Juba"/> <mapZone other="E. Africa Standard Time" territory="TZ" type="Africa/Dar_es_Salaam"/> <mapZone other="E. Africa Standard Time" territory="UG" type="Africa/Kampala"/> <mapZone other="E. Africa Standard Time" territory="YT" type="Indian/Mayotte"/> diff --git a/tools/java/org/unicode/cldr/util/data/africa b/tools/java/org/unicode/cldr/util/data/africa index 834ed907..6fbfb051 100644 --- a/tools/java/org/unicode/cldr/util/data/africa +++ b/tools/java/org/unicode/cldr/util/data/africa @@ -1527,11 +1527,17 @@ Zone Africa/Khartoum 2:10:08 - LMT 1931 3:00 - EAT 2017 Nov 1 2:00 - CAT +# From Steffen Thorsen (2021-01-18): +# "South Sudan will change its time zone by setting the clock back 1 +# hour on February 1, 2021...." +# from https://eyeradio.org/south-sudan-adopts-new-time-zone-makuei/ + # South Sudan # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone Africa/Juba 2:06:28 - LMT 1931 2:00 Sudan CA%sT 2000 Jan 15 12:00 - 3:00 - EAT + 3:00 - EAT 2021 Feb 1 00:00 + 2:00 - CAT # Tanzania # See Africa/Nairobi. diff --git a/tools/java/org/unicode/cldr/util/data/tzdb-version.txt b/tools/java/org/unicode/cldr/util/data/tzdb-version.txt index a481df8c..1d590958 100644 --- a/tools/java/org/unicode/cldr/util/data/tzdb-version.txt +++ b/tools/java/org/unicode/cldr/util/data/tzdb-version.txt @@ -1 +1 @@ -2020f +2021a |