Implement ISO week number (%V) #37
Merged
Conversation
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
|
An unrelated bug I noticed here: week number parsing should consume two characters at most. So in parseWeekNumberMonday, parseWeekNumberSunday, parseWeekNumberISO, instead of: var n = numberRe.exec(string.slice(i));It should say: var n = numberRe.exec(string.slice(i, i + 2)); |
mbostock
reviewed
Oct 7, 2017
src/locale.js
Outdated
| d.m = 0; | ||
| d.d = "W" in d ? (d.w + 6) % 7 + d.W * 7 - (day + 5) % 7 : d.w + d.U * 7 - (day + 6) % 7; | ||
| if ("W" in d || "U" in d || "V" in d) { | ||
| if ("V" in d) { |
There was a problem hiding this comment.
I’d split these if-else blocks:
if ("V" in d) {
…
} else if ("W" in d || "U" in d) {
…
}|
Nicely done. Thank you for this pull request! |
|
That should do it. |
|
Thanks! Merged with a few tweaks. |
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.
This is based off of the logic in d3/d3#2151 and would close #8.
The logic for parsing is much more complicated than the other week formats (
%Wand%U), so I wasn't quite sure how to fit it in. Any new commits or suggestions of refactoring/rewriting are welcome 😄