Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLDR-13716 Added metazone Morocco (short: moro) #3686

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

CLDR-13716 Added metazone Morocco (short: moro) #3686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions common/main/en.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4612,6 +4612,13 @@ annotations.
<daylight>Ulaanbaatar Summer Time</daylight>
</long>
</metazone>
<metazone type="Morocco">
<long>
<generic>Morocco Time</generic>
<standard>Morocco Ramadan Time</standard>
<daylight>Morocco Standard Time</daylight>
</long>
</metazone>
<metazone type="Moscow">
<long>
<generic>Moscow Time</generic>
Expand Down
4 changes: 2 additions & 2 deletions common/supplemental/coverageLevels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ For terms of use, see http://www.unicode.org/copyright.html
<coverageVariable key="%metazone60" value="(Africa_Western|Arabian|Australia_(Central(Western)?|(East|West)ern)|China|Israel|Japan|Korea|Moscow)"/>
<coverageVariable key="%metazone60_stdonly" value="(Africa_(Central|(East|South)ern)|India|Indochina|Indonesia_(Central|(East|West)ern))"/>
<coverageVariable key="%metazone60_AE_stdonly" value="Gulf"/>
<coverageVariable key="%metazone80" value="(Alaska|Amazon|Apia|Argentina(_Western)?|Armenia|Azerbaijan|Azores|Bangladesh|Brasilia|Cape_Verde|Chatham|Chile|Choibalsan|Colombia|Cook|Cuba|Easter|Falkland|Fiji|Georgia|Greenland_(East|West)ern|Hawaii_Aleutian|Hong_Kong|Hovd|Iran|Irkutsk|Krasnoyarsk|Lord_Howe|Magadan|Mauritius|Mexico_(Northwest|Pacific)|Mongolia|New_(Caledonia|Zealand)|Newfoundland|Norfolk|Noronha|Novosibirsk|Omsk|Pakistan|Paraguay|Peru|Philippines|Pierre_Miquelon|Sakhalin|Samoa|Taipei|Tonga|Turkmenistan|Uruguay|Uzbekistan|Vanuatu|Vladivostok|Volgograd|Yakutsk|Yekaterinburg)"/>
<coverageVariable key="%metazone80" value="(Alaska|Amazon|Apia|Argentina(_Western)?|Armenia|Azerbaijan|Azores|Bangladesh|Brasilia|Cape_Verde|Chatham|Chile|Choibalsan|Colombia|Cook|Cuba|Easter|Falkland|Fiji|Georgia|Greenland_(East|West)ern|Hawaii_Aleutian|Hong_Kong|Hovd|Iran|Irkutsk|Krasnoyarsk|Lord_Howe|Magadan|Mauritius|Mexico_(Northwest|Pacific)|Mongolia|Morocco|New_(Caledonia|Zealand)|Newfoundland|Norfolk|Noronha|Novosibirsk|Omsk|Pakistan|Paraguay|Peru|Philippines|Pierre_Miquelon|Sakhalin|Samoa|Taipei|Tonga|Turkmenistan|Uruguay|Uzbekistan|Vanuatu|Vladivostok|Volgograd|Yakutsk|Yekaterinburg)"/>
<coverageVariable key="%metazone80_stdonly" value="(Afghanistan|Bhutan|Bolivia|Brunei|Chamorro|Christmas|Cocos|Davis|DumontDUrville|East_Timor|Ecuador|Europe_Further_Eastern|French_(Guiana|Southern)|Gambier|Galapagos|Gilbert_Islands|Gulf|Guyana|Indian_Ocean|Kazakhstan_(East|West)ern|Kosrae|Kyrgystan|Line_Islands|Malaysia|Maldives|Marquesas|Marshall_Islands|Mawson|Myanmar|Nauru|Nepal|Niue|Palau|Papua_New_Guinea|Phoenix_Islands|Pitcairn|Ponape|Pyongyang|Reunion|Rothera|Seychelles|Singapore|Solomon|South_Georgia|Suriname|Syowa|Tahiti|Tajikistan|Tokelau|Truk|Tuvalu|Venezuela|Vostok|Wake|Wallis|Yukon)"/>
<coverageVariable key="%metazone100" value="(Acre|Almaty|Anadyr|Aqtau|Aqtobe|Kamchatka|Macau|Qyzylorda|Samara)"/>
<coverageVariable key="%metazone100_stdonly" value="(Casey|Guam|Lanka|North_Mariana)"/>
Expand Down Expand Up @@ -1006,4 +1006,4 @@ For terms of use, see http://www.unicode.org/copyright.html
<pathMatch id="annotations1" match="annotations/annotation[@cp='%anyAttribute'][@type='%anyAttribute']"/>
<pathMatch id="annotations2" match="annotations/annotation[@cp='%anyAttribute']"/>
</coverageLevels>
</supplementalData>
</supplementalData>
4 changes: 4 additions & 0 deletions common/supplemental/metaZones.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ For terms of use, see http://www.unicode.org/copyright.html
<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 to="2018-10-28 02:00" from="1985-12-31 23:00" mzone="Europe_Western"/>
<usesMetazone to="2018-10-28 02:00" mzone="Morocco"/>
</timezone>
<timezone type="Africa/Ceuta">
<usesMetazone to="1984-03-16 00:00" mzone="Europe_Western"/>
Expand All @@ -80,6 +81,7 @@ For terms of use, see http://www.unicode.org/copyright.html
<timezone type="Africa/El_Aaiun">
<usesMetazone to="1976-04-14 01:00" mzone="Africa_FarWestern"/>
<usesMetazone to="2018-10-28 02:00" from="1976-04-14 01:00" mzone="Europe_Western"/>
<usesMetazone to="2018-10-28 02:00" mzone="Morocco"/>
</timezone>
<timezone type="Africa/Freetown">
<usesMetazone mzone="GMT"/>
Expand Down Expand Up @@ -1800,6 +1802,7 @@ For terms of use, see http://www.unicode.org/copyright.html
<mapZone other="Mawson" territory="001" type="Antarctica/Mawson"/>
<mapZone other="Mexico_Pacific" territory="001" type="America/Mazatlan"/>
<mapZone other="Mongolia" territory="001" type="Asia/Ulaanbaatar"/>
<mapZone other="Morocco" territory="001" type="Africa/Casablanca"/>
<mapZone other="Moscow" territory="001" type="Europe/Moscow"/>
<mapZone other="Myanmar" territory="001" type="Asia/Rangoon"/>
<mapZone other="Nauru" territory="001" type="Pacific/Nauru"/>
Expand Down Expand Up @@ -1972,6 +1975,7 @@ For terms of use, see http://www.unicode.org/copyright.html
<metazoneId shortId="maws" longId="Mawson" />
<metazoneId shortId="mepa" longId="Mexico_Pacific" />
<metazoneId shortId="mong" longId="Mongolia" />
<metazoneId shortId="moro" longId="Morocco" />
<metazoneId shortId="mosc" longId="Moscow" />
<metazoneId shortId="myan" longId="Myanmar" />
<metazoneId shortId="naur" longId="Nauru" />
Expand Down
1 change: 1 addition & 0 deletions tools/cldr-code/src/main/java/org/unicode/cldr/util/LogicalGrouping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ public class LogicalGrouping {
"Mexico_Northwest",
"Mexico_Pacific",
"Mongolia",
"Morocco",
"Moscow",
"New_Caledonia",
"New_Zealand",
Expand Down
Loading