Conversation
Member
Author
How to use the Graphite Merge QueueAdd either label to this PR to merge it via the merge queue:
You must have a Graphite account in order to use the merge queue. Sign up using this link. An organization admin has required the Graphite Merge Queue in this repository. Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue. This stack of pull requests is managed by Graphite. Learn more about stacking. |
f1df470 to
a36f524
Compare
…with hour12 and 2-digit hour When using hour: '2-digit' with hour12: true, BestFitFormatMatcher selected a format with skeleton "MMMEd, h:mm a" instead of "MMMEd, hm". The raw pattern form didn't match any interval format key, causing formatRange to fall back to the default pattern which duplicates dates. Added findIntervalFormat() to canonicalize raw time skeletons (e.g., "h:mm a" → "hm") when looking up interval formats during locale data loading. Fixes #4535 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
a36f524 to
f0fbe9c
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
Fixes #4535
When using
formatRangewithhour: '2-digit'andhour12: true, the date portion was duplicated in the output:Root Cause
BestFitFormatMatchercorrectly selected a format with skeleton"MMMEd, h:mm a"(matching the2-digithour preference), but the interval format lookup in__addLocaleDataonly checked for exact key matches. Since CLDR interval formats use canonical skeleton keys ("MMMEd, hm") rather than raw pattern keys ("MMMEd, h:mm a"), the lookup returnedundefinedandformatRangefell back to the default pattern which formats start and end dates separately.Fix
Added
findIntervalFormat()incore.tsthat canonicalizes raw time skeleton patterns when the exact key doesn't match. For example,"h:mm a"→"hm","HH:mm:ss"→"Hms". This runs only as a fallback during locale data loading when the direct key lookup fails.Why
en-GBworked butendidn't in existing testsThe existing tests used
en-GBwithhour: 'numeric', which matched the canonicalhmskeleton directly. Theenlocale withhour: '2-digit'matchedh:mm awhich lacked interval formats.Test plan
enlocale withhour12: true(bothnumericand2-digit)pnpm ten-GBtests continue to pass