Add cyclic year to FormattableYear
#3581
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
reviewed
Jun 27, 2023
| @@ -37,9 +37,6 @@ impl FromStr for Era { | |||
| } | |||
|
|
|||
| /// Representation of a formattable year. | |||
| /// | |||
| /// More fields may be added in the future, for things like | |||
| /// the cyclic or extended year | |||
There was a problem hiding this comment.
nit: we should probably keep the comment around for extended year
There was a problem hiding this comment.
I've added the comment back in
components/calendar/src/types.rs
Outdated
| @@ -49,6 +46,10 @@ pub struct FormattableYear { | |||
| /// The year number in the current era (usually 1-based). | |||
| pub number: i32, | |||
|
|
|||
| /// The year in the current cycle for cyclic calendars; | |||
| /// can be ignored and set to any value for non-cyclic calendars. | |||
| pub cyclic: i32, | |||
There was a problem hiding this comment.
issue: this should probably be an Option, allowing formatter implementations to choose how to handle unknown cyclics
There was a problem hiding this comment.
Ok, I made this an Option with all currently existing calendars having this field set to None
Manishearth
previously approved these changes
Jun 27, 2023
atcupps
requested review from
zbraniecki,
gregtatum and
nordzilla
as code owners
Manishearth
approved these changes
Jun 27, 2023
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.
Traditionally, instead of counting ordinal years (ex. 1, 2, 3, ... 2022, 2023, ...), the Chinese calendar counts years in cycles of 60 (ex. 1, 2, 3, ... 59, 60, 1, 2, 3, ...), at least insofar as the names of years repeat each 60 years. Although in modern times the year can be counted by using the associated Gregorian/ISO year (which already has a
related_isofield inFormattableYear), cyclic year is still necessary to provide complete date formatting for the Chinese calendar.Considering this, I propose adding a single field
pub cyclic: i32toFormattableYear, which can be set to any value for non-cyclic calendars (I set the field to be 0 in all currently-existing calendars, but it doesn't matter for those calendars since this value should not be read), and set to an integer value for calendars like the Chinese calendar which use cyclic years.