Skip to content

Commit

Permalink
Accept abbreviated March, June, July in Norwegian locales (#1431)
Browse files Browse the repository at this point in the history
  • Loading branch information
@lovelovedokidoki @kossnocorp
lovelovedokidoki authored and kossnocorp committed Sep 24, 2019
1 parent 9df73b7 commit 1a7bcba
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 10 deletions.
36 changes: 31 additions & 5 deletions src/locale/nb/_lib/match/index.js
View file
Expand Up @@ -24,12 +24,38 @@ var parseQuarterPatterns = {

var matchMonthPatterns = {
narrow: /^[jfmasond]/i,
abbreviated: /^(jan|feb|mar|apr|mai|jun|jul|aug|sep|okt|nov|des)\.?/i,
abbreviated: /^(jan|feb|mars?|apr|mai|juni?|juli?|aug|sep|okt|nov|des)\.?/i,
wide: /^(januar|februar|mars|april|mai|juni|juli|august|september|oktober|november|desember)/i
}
var parseMonthPatterns = {
narrow: [/^j/i, /^f/i, /^m/i, /^a/i, /^m/i, /^j/i, /^j/i, /^a/i, /^s/i, /^o/i, /^n/i, /^d/i],
any: [/^ja/i, /^f/i, /^mar/i, /^ap/i, /^mai/i, /^jun/i, /^jul/i, /^aug/i, /^s/i, /^o/i, /^n/i, /^d/i]
narrow: [
/^j/i,
/^f/i,
/^m/i,
/^a/i,
/^m/i,
/^j/i,
/^j/i,
/^a/i,
/^s/i,
/^o/i,
/^n/i,
/^d/i
],
any: [
/^ja/i,
/^f/i,
/^mar/i,
/^ap/i,
/^mai/i,
/^jun/i,
/^jul/i,
/^aug/i,
/^s/i,
/^o/i,
/^n/i,
/^d/i
]
}

var matchDayPatterns = {
Expand Down Expand Up @@ -63,7 +89,7 @@ var match = {
ordinalNumber: buildMatchPatternFn({
matchPattern: matchOrdinalNumberPattern,
parsePattern: parseOrdinalNumberPattern,
valueCallback: function (value) {
valueCallback: function(value) {
return parseInt(value, 10)
}
}),
Expand All @@ -80,7 +106,7 @@ var match = {
defaultMatchWidth: 'wide',
parsePatterns: parseQuarterPatterns,
defaultParseWidth: 'any',
valueCallback: function (index) {
valueCallback: function(index) {
return index + 1
}
}),
Expand Down
4 changes: 2 additions & 2 deletions src/locale/nb/snapshot.md
View file
Expand Up @@ -25,15 +25,15 @@
| Month (formatting) | Mo | 2019-02-11T12:13:14.015Z | 2. | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | 7. | 2019-07-01T00:00:00.000Z |
| | MMM | 2019-02-11T12:13:14.015Z | feb. | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | juli | Invalid Date |
| | | 2019-07-10T12:13:14.015Z | juli | 2019-07-01T00:00:00.000Z |
| | MMMM | 2019-02-11T12:13:14.015Z | februar | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | juli | 2019-07-01T00:00:00.000Z |
| | MMMMM | 2019-02-11T12:13:14.015Z | F | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | J | 2019-01-01T00:00:00.000Z |
| Month (stand-alone) | Lo | 2019-02-11T12:13:14.015Z | 2. | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | 7. | 2019-07-01T00:00:00.000Z |
| | LLL | 2019-02-11T12:13:14.015Z | feb. | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | juli | Invalid Date |
| | | 2019-07-10T12:13:14.015Z | juli | 2019-07-01T00:00:00.000Z |
| | LLLL | 2019-02-11T12:13:14.015Z | februar | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | juli | 2019-07-01T00:00:00.000Z |
| | LLLLL | 2019-02-11T12:13:14.015Z | F | 2019-02-01T00:00:00.000Z |
Expand Down
2 changes: 1 addition & 1 deletion src/locale/nn/_lib/match/index.js
View file
Expand Up @@ -24,7 +24,7 @@ var parseQuarterPatterns = {

var matchMonthPatterns = {
narrow: /^[jfmasond]/i,
abbreviated: /^(jan|feb|mar|apr|mai|jun|jul|aug|sep|okt|nov|des)\.?/i,
abbreviated: /^(jan|feb|mars?|apr|mai|juni?|juli?|aug|sep|okt|nov|des)\.?/i,
wide: /^(januar|februar|mars|april|mai|juni|juli|august|september|oktober|november|desember)/i
}
var parseMonthPatterns = {
Expand Down
4 changes: 2 additions & 2 deletions src/locale/nn/snapshot.md
View file
Expand Up @@ -25,15 +25,15 @@
| Month (formatting) | Mo | 2019-02-11T12:13:14.015Z | 2. | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | 7. | 2019-07-01T00:00:00.000Z |
| | MMM | 2019-02-11T12:13:14.015Z | feb. | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | juli | Invalid Date |
| | | 2019-07-10T12:13:14.015Z | juli | 2019-07-01T00:00:00.000Z |
| | MMMM | 2019-02-11T12:13:14.015Z | februar | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | juli | 2019-07-01T00:00:00.000Z |
| | MMMMM | 2019-02-11T12:13:14.015Z | F | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | J | 2019-01-01T00:00:00.000Z |
| Month (stand-alone) | Lo | 2019-02-11T12:13:14.015Z | 2. | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | 7. | 2019-07-01T00:00:00.000Z |
| | LLL | 2019-02-11T12:13:14.015Z | feb. | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | juli | Invalid Date |
| | | 2019-07-10T12:13:14.015Z | juli | 2019-07-01T00:00:00.000Z |
| | LLLL | 2019-02-11T12:13:14.015Z | februar | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | juli | 2019-07-01T00:00:00.000Z |
| | LLLLL | 2019-02-11T12:13:14.015Z | F | 2019-02-01T00:00:00.000Z |
Expand Down

0 comments on commit 1a7bcba

Please sign in to comment.