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

Fix generic location format for single-tz countries #5657

Merged
merged 11 commits into from
Oct 10, 2024
Merged

Fix generic location format for single-tz countries #5657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6535b10
new testdata sources
robertbastian Oct 8, 2024
93603bd
primary zones
robertbastian Oct 8, 2024
a9ec24f
datagen
robertbastian Oct 8, 2024
4ab5170
fix test
robertbastian Oct 8, 2024
f347258
features
robertbastian Oct 8, 2024
0213cea
remove inaccessible exemplar cities
robertbastian Oct 8, 2024
aee45bb
Merge branch 'main' into primaryzone
robertbastian Oct 8, 2024
a62aef0
fmt
robertbastian Oct 8, 2024
3578eda
collapse into exemplar data struct
robertbastian Oct 8, 2024
59874ce
clippy
robertbastian Oct 8, 2024
f6f805a
revert more
robertbastian Oct 8, 2024
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
2 changes: 1 addition & 1 deletion components/datetime/src/format/neo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1034,7 +1034,7 @@ impl<C: CldrCalendar, R: DateTimeNamesMarker> TypedDateTimeNames<C, R> {
///
/// assert_try_writeable_eq!(
/// names.with_pattern(&pattern).format(&zone_london_winter),
/// "Your time zone is: London Time",
/// "Your time zone is: United Kingdom Time",
/// );
/// ```
#[cfg(feature = "compiled_data")]
Expand Down
10 changes: 5 additions & 5 deletions components/datetime/tests/patterns/tests/time_zones.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
"configs": [
"GenericLocation"
],
"expected": ["London Time"]
"expected": ["United Kingdom Time"]
},
{
"patterns": [],
Expand Down Expand Up @@ -314,7 +314,7 @@
"configs": [
"GenericLocation"
],
"expected": ["Dublin Time"]
"expected": ["Ireland Time"]
},
{
"patterns": [],
Expand Down Expand Up @@ -465,7 +465,7 @@
"configs": [
"GenericLocation"
],
"expected": ["東京時間"]
"expected": ["日本時間"]
},
{
"patterns": [
Expand Down Expand Up @@ -802,7 +802,7 @@
"configs": [
"GenericNonLocationShort"
],
"expected": ["Катманду"]
"expected": ["Непал"]
},
{
"patterns": [
Expand All @@ -827,7 +827,7 @@
"configs": [
"GenericLocation"
],
"expected": ["Катманду"]
"expected": ["Непал"]
},
{
"patterns": [
Expand Down
478 changes: 307 additions & 171 deletions provider/data/datetime/data/exemplar_cities_v1_marker.rs.data
View file
Open in desktop

Large diffs are not rendered by default.

388 changes: 218 additions & 170 deletions provider/data/datetime/fingerprints.csv
View file
Open in desktop

Large diffs are not rendered by default.

Loading