Skip to content

Commit 19bf014

Browse files
committed
Model Morocco as Sundown
1 parent 10a82a9 commit 19bf014

File tree

16 files changed

+124
-50
lines changed

16 files changed

+124
-50
lines changed

components/datetime/tests/patterns/tests/time_zones.json

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,5 +263,39 @@
263263
"xxxx": "+0000",
264264
"XXXXX": "Z"
265265
}
266+
},
267+
{
268+
"locale": "en-GB",
269+
"datetime": "2021-07-11T12:00:00.000+01[Africa/Casablanca]",
270+
"expectations": {
271+
"z": "CET",
272+
"zzzz": "Central European Standard Time",
273+
274+
"v": "CET",
275+
"vvvv": "Central European Time",
276+
277+
"VVV": "Casablanca",
278+
"VVVV": "Morocco Time",
279+
280+
"O": "GMT+1",
281+
"OOOO": "GMT+01:00"
282+
}
283+
},
284+
{
285+
"locale": "en-GB",
286+
"datetime": "2021-07-11T12:00:00.000+00[Africa/Casablanca]",
287+
"expectations": {
288+
"z": "GMT+0",
289+
"zzzz": "Morocco Ramadan Time",
290+
291+
"v": "CET",
292+
"vvvv": "Central European Time",
293+
294+
"VVV": "Casablanca",
295+
"VVVV": "Morocco Time",
296+
297+
"O": "GMT+0",
298+
"OOOO": "GMT+00:00"
299+
}
266300
}
267301
]

components/time/src/zone/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,6 @@ impl TimeZoneVariant {
506506
///
507507
/// * `Europe/Dublin` since 1968-10-27
508508
/// * `Africa/Windhoek` between 1994-03-20 and 2017-10-24
509-
/// * `Africa/Casablanca` and `Africa/El_Aaiun` since 2018-10-28
510509
///
511510
/// If the TZDB build mode is unknown or variable, use [`TimeZoneInfo::infer_variant`].
512511
pub const fn from_rearguard_isdst(isdst: bool) -> Self {

provider/data/datetime/data/timezone_metazone_periods_v1.rs.data

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

provider/data/datetime/data/timezone_names_specific_long_v1.rs.data

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

provider/data/datetime/fingerprints.csv

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27293,7 +27293,7 @@ datetime/patterns/time/v1, zh/h, -> yue-Hans/h
2729327293
datetime/patterns/time/v1, zh/h0, -> yue-Hans/h0
2729427294
datetime/patterns/time/v1, zh/j, -> yue-Hans/h0
2729527295
datetime/patterns/time/v1, zu/h, -> az/h
27296-
timezone/metazone/periods/v1, <singleton>, 7421B, 7333B, 2c1b1e90600de553
27296+
timezone/metazone/periods/v1, <singleton>, 7431B, 7343B, 83352f522f03c634
2729727297
timezone/names/cities/override/v1, <lookup>, 840B, 161 identifiers
2729827298
timezone/names/cities/override/v1, <total>, 248266B, 241799B, 146 unique payloads
2729927299
timezone/names/cities/override/v1, af, 882B, 838B, 1f378152ac0f4a7f
@@ -28186,7 +28186,7 @@ timezone/names/locations/root/v1, yue-Hans, 9149B, 9013B, 1ce414ede7467cef
2818628186
timezone/names/locations/root/v1, zh, -> yue-Hans
2818728187
timezone/names/locations/root/v1, zh-Hant, -> yue
2818828188
timezone/names/specific/long/v1, <lookup>, 940B, 192 identifiers
28189-
timezone/names/specific/long/v1, <total>, 725436B, 706246B, 170 unique payloads
28189+
timezone/names/specific/long/v1, <total>, 725529B, 706339B, 170 unique payloads
2819028190
timezone/names/specific/long/v1, af, 2309B, 2196B, 866c2a589949b10c
2819128191
timezone/names/specific/long/v1, ak, 3319B, 3206B, af7538e2fe20ced6
2819228192
timezone/names/specific/long/v1, am, 6824B, 6712B, 5ee55fe5e9a6f1ae
@@ -28220,9 +28220,9 @@ timezone/names/specific/long/v1, doi, 1605B, 1492B, 8d08cc015e396777
2822028220
timezone/names/specific/long/v1, dsb, 4027B, 3914B, fc160ec97410235f
2822128221
timezone/names/specific/long/v1, ee, 4021B, 3908B, 5ccb96a6ca401b6f
2822228222
timezone/names/specific/long/v1, el, 6266B, 6154B, 9295634968cfc43b
28223-
timezone/names/specific/long/v1, en, 2214B, 2101B, fbb32291b1982fac
28224-
timezone/names/specific/long/v1, en-CA, 2361B, 2248B, 6bd91e17381094ef
28225-
timezone/names/specific/long/v1, en-IN, 2215B, 2102B, 68597da2b3dabcb1
28223+
timezone/names/specific/long/v1, en, 2245B, 2132B, bf0911a1457e1ea8
28224+
timezone/names/specific/long/v1, en-CA, 2392B, 2279B, 3c0d5ed004c7bb36
28225+
timezone/names/specific/long/v1, en-IN, 2246B, 2133B, c4254e076fb24fca
2822628226
timezone/names/specific/long/v1, eo, -> bgc
2822728227
timezone/names/specific/long/v1, es, 4089B, 3976B, 1f2030e3761bd9f2
2822828228
timezone/names/specific/long/v1, es-419, 2535B, 2422B, 79566bc09461e088

0 commit comments

Comments
 (0)