Skip to content

Commit a824262

Browse files
Fix generic location format for single-tz countries (#5657)
1 parent 1ee7f51 commit a824262

File tree

34 files changed

+4548
-3725
lines changed

34 files changed

+4548
-3725
lines changed

components/datetime/src/format/neo.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1034,7 +1034,7 @@ impl<C: CldrCalendar, R: DateTimeNamesMarker> TypedDateTimeNames<C, R> {
10341034
///
10351035
/// assert_try_writeable_eq!(
10361036
/// names.with_pattern(&pattern).format(&zone_london_winter),
1037-
/// "Your time zone is: London Time",
1037+
/// "Your time zone is: United Kingdom Time",
10381038
/// );
10391039
/// ```
10401040
#[cfg(feature = "compiled_data")]

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@
214214
"configs": [
215215
"GenericLocation"
216216
],
217-
"expected": ["London Time"]
217+
"expected": ["United Kingdom Time"]
218218
},
219219
{
220220
"patterns": [],
@@ -314,7 +314,7 @@
314314
"configs": [
315315
"GenericLocation"
316316
],
317-
"expected": ["Dublin Time"]
317+
"expected": ["Ireland Time"]
318318
},
319319
{
320320
"patterns": [],
@@ -465,7 +465,7 @@
465465
"configs": [
466466
"GenericLocation"
467467
],
468-
"expected": ["東京時間"]
468+
"expected": ["日本時間"]
469469
},
470470
{
471471
"patterns": [
@@ -802,7 +802,7 @@
802802
"configs": [
803803
"GenericNonLocationShort"
804804
],
805-
"expected": ["Катманду"]
805+
"expected": ["Непал"]
806806
},
807807
{
808808
"patterns": [
@@ -827,7 +827,7 @@
827827
"configs": [
828828
"GenericLocation"
829829
],
830-
"expected": ["Катманду"]
830+
"expected": ["Непал"]
831831
},
832832
{
833833
"patterns": [

provider/data/datetime/data/exemplar_cities_v1_marker.rs.data

+307-171
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

provider/data/datetime/fingerprints.csv

+218-170
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)