Update data model for non-gregorian calendars #1300
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Manishearth
requested review from
gregtatum,
nordzilla,
sffc,
zbraniecki and
a team
as code owners
zbraniecki
previously approved these changes
Nov 16, 2021
sffc
requested changes
Nov 16, 2021
| Ok(idx) => &self.data[idx].1.dates, | ||
| Err(_) => return Err(DataError::MissingResourceOptions(req.clone())), | ||
| }; | ||
| let dates = self.0.dates_for(req)?; |
There was a problem hiding this comment.
Praise: I like the way you refactored this code
| @@ -37,7 +37,7 @@ impl TryFrom<&dyn CldrPaths> for TimeZonesProvider { | |||
| fn try_from(cldr_paths: &dyn CldrPaths) -> Result<Self, Self::Error> { | |||
| let mut data = vec![]; | |||
|
|
|||
| let path = cldr_paths.cldr_dates()?.join("main"); | |||
| let path = cldr_paths.cldr_dates("gregorian")?.join("main"); | |||
There was a problem hiding this comment.
Question: Is there time zone data in other calendars, or is it always stored in the gregorian calendar data bundle?
There was a problem hiding this comment.
Not that I know of: https://github.com/unicode-cldr/cldr-cal-buddhist-full/tree/master/main/af
There was a problem hiding this comment.
(I linked to the wrong repo, but the point still stands when looking at the cldr-json repo)
| let list: Vec<ResourceOptions> = self | ||
| .data | ||
| .iter() | ||
| .flat_map(|(cal, map)| { |
There was a problem hiding this comment.
Note: This is the "magic" that informs the data exporter to loop over both variants and locales when putting together the data tree.
gregtatum
previously approved these changes
Nov 16, 2021
sffc
reviewed
Nov 17, 2021
sffc
approved these changes
Nov 17, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Progress on #1115
Previously, date data was stored as
gregory_symbols@1/en.json(etc). We'd like to use the same data format for all of the calendars, so now data is stored undersymbols@1/gregorian/en.json, with"gregorian"being the variant. Datetime data now requires a variant referring to the calendar.Datetime formatting code has not been modified to support other calendars; it hardcodes
"gregorian"instead. This will be updated in a future PR; this PR is just setting the stage for these changes.The full changes here are:
CldrPathssupports yielding multiple calendars, though only gregorian is hooked up right now.CldrPaths, sorted under variantsGREGORY_FOO_BARkeys have been renamed to remove "gregory" from the namegregorydata struct module has been renamed tocalendar