diff options
| author | Victor Chang <vichang@google.com> | 2018-11-08 11:38:31 +0000 |
|---|---|---|
| committer | Victor Chang <vichang@google.com> | 2018-11-08 11:38:31 +0000 |
| commit | e55918306dd739514d99c7ff50236cb59bd4de34 (patch) | |
| tree | 5713bcd85d5a1255562694576337f977dd510a91 | |
| parent | a71b248034cab1eb2ef38ac71d0cbea2bff9d9df (diff) | |
| download | cldr-e55918306dd739514d99c7ff50236cb59bd4de34.tar.gz | |
Cherry-pick: cldr-ticket 11523: Update Android CLDR tzdata from 2018f to 2018gandroid-wear-8.0.0_r2
Cherrypick https://unicode.org/cldr/trac/changeset/14566
Bug: 117917198
Test: external/icu/tools/udpatecldrdata.py
Change-Id: I472c42e045b4e47a2a9b31b45db958720934c0a3
| -rw-r--r-- | common/supplemental/metaZones.xml | 6 | ||||
| -rw-r--r-- | common/supplemental/windowsZones.xml | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/common/supplemental/metaZones.xml b/common/supplemental/metaZones.xml index 1b6933ce..d0f62ebf 100644 --- a/common/supplemental/metaZones.xml +++ b/common/supplemental/metaZones.xml @@ -56,7 +56,8 @@ For terms of use, see http://www.unicode.org/copyright.html <timezone type="Africa/Casablanca"> <usesMetazone to="1984-03-16 00:00" mzone="Europe_Western"/> <usesMetazone to="1985-12-31 23:00" from="1984-03-16 00:00" mzone="Europe_Central"/> - <usesMetazone from="1985-12-31 23:00" mzone="Europe_Western"/> + <usesMetazone to="2018-10-26 23:00" from="1985-12-31 23:00" mzone="Europe_Western"/> + <usesMetazone from="2018-10-26 23:00" mzone="Europe_Central"/> </timezone> <timezone type="Africa/Ceuta"> <usesMetazone to="1984-03-16 00:00" mzone="Europe_Western"/> @@ -79,7 +80,8 @@ For terms of use, see http://www.unicode.org/copyright.html </timezone> <timezone type="Africa/El_Aaiun"> <usesMetazone to="1976-04-14 01:00" mzone="Africa_FarWestern"/> - <usesMetazone from="1976-04-14 01:00" mzone="Europe_Western"/> + <usesMetazone to="2018-10-26 23:00" from="1976-04-14 01:00" mzone="Europe_Western"/> + <usesMetazone from="2018-10-26 23:00" mzone="Europe_Central"/> </timezone> <timezone type="Africa/Freetown"> <usesMetazone mzone="GMT"/> diff --git a/common/supplemental/windowsZones.xml b/common/supplemental/windowsZones.xml index c9412039..f12064a0 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: 14334 $"/> <windowsZones> - <mapTimezones otherVersion="7e10c00" typeVersion="2018e"> + <mapTimezones otherVersion="7e10c00" typeVersion="2018g"> <!-- (UTC-12:00) International Date Line West --> <mapZone other="Dateline Standard Time" territory="001" type="Etc/GMT+12"/> @@ -268,11 +268,6 @@ For terms of use, see http://www.unicode.org/copyright.html <mapZone other="UTC" territory="GL" type="America/Danmarkshavn"/> <mapZone other="UTC" territory="ZZ" type="Etc/GMT Etc/UTC"/> - <!-- (UTC+00:00) Casablanca --> - <mapZone other="Morocco Standard Time" territory="001" type="Africa/Casablanca"/> - <mapZone other="Morocco Standard Time" territory="EH" type="Africa/El_Aaiun"/> - <mapZone other="Morocco Standard Time" territory="MA" type="Africa/Casablanca"/> - <!-- (UTC+00:00) Dublin, Edinburgh, Lisbon, London --> <mapZone other="GMT Standard Time" territory="001" type="Europe/London"/> <mapZone other="GMT Standard Time" territory="ES" type="Atlantic/Canary"/> @@ -337,6 +332,11 @@ For terms of use, see http://www.unicode.org/copyright.html <mapZone other="Romance Standard Time" territory="ES" type="Europe/Madrid Africa/Ceuta"/> <mapZone other="Romance Standard Time" territory="FR" type="Europe/Paris"/> + <!-- (UTC+01:00) Casablanca --> + <mapZone other="Morocco Standard Time" territory="001" type="Africa/Casablanca"/> + <mapZone other="Morocco Standard Time" territory="EH" type="Africa/El_Aaiun"/> + <mapZone other="Morocco Standard Time" territory="MA" type="Africa/Casablanca"/> + <!-- (UTC+01:00) Sao Tome --> <mapZone other="Sao Tome Standard Time" territory="001" type="Africa/Sao_Tome"/> <mapZone other="Sao Tome Standard Time" territory="ST" type="Africa/Sao_Tome"/> |