Skip to content

Parse Sun Mar 23 10:14:18 CET 2021 #113

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

Open
konradzawadka wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Parse Sun Mar 23 10:14:18 CET 2021 #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions lib/parseformat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,19 +281,24 @@ function parseFormat (dateString, options) {
format = format.replace(regexMonth, options.preferLongFormat ? 'MM' : 'M')
}

// If still remaining more numbers and year is not present then one number is the year
if (!format.match(formatIncludesYear) && format.match(formatHasTimeAfterRemainingDigits)) {
format = format.replace(regexYearShort, 'YY')
}

// Check for some odd cases, such as MMMM <some number that is a DAY> <more of the format>
if (format.match(formatHasDayWithLeadingZeroAfterMonthSegment) && !format.match(formatHasTimeAfterRemainingDigits)) {
if (format.match(formatHasDayWithLeadingZeroAfterMonthSegment)) {
format = format.replace(regexDayLeadingZero, 'DD')
}
if (format.match(formatHasDayAfterMonthSegment) && !format.match(formatHasTimeAfterRemainingDigits)) {
if (format.match(formatHasDayAfterMonthSegment)) {
format = format.replace(regexDay, options.preferLongFormat ? 'DD' : 'D')
}

// now, the next number, if existing, must be a day IF it is the last set of numbers in the format
if (!format.match(formatIncludesNumericDay) && format.match(formatHasMultipleRemainingSegments) && !format.match(formatHasTimeAfterRemainingDigits)) {
if (!format.match(formatIncludesNumericDay) && format.match(formatHasMultipleRemainingSegments) ) {
format = format.replace(regexDayLeadingZero, 'DD')
}
if (!format.match(formatIncludesNumericDay) && format.match(formatHasMultipleRemainingSegments) && !format.match(formatHasTimeAfterRemainingDigits)) {
if (!format.match(formatIncludesNumericDay) && format.match(formatHasMultipleRemainingSegments) ) {
format = format.replace(regexDay, options.preferLongFormat ? 'DD' : 'D')
}

Expand Down
2 changes: 1 addition & 1 deletion test/moment-parseformat-test.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.