Skip to content

Commit

Permalink
Fix french parsing issue with June and August (#1430)
Browse files Browse the repository at this point in the history
  • Loading branch information
lovelovedokidoki authored and kossnocorp committed Sep 24, 2019
1 parent 1a7bcba commit e7e4dcf
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 8 deletions.
34 changes: 30 additions & 4 deletions src/locale/fr/_lib/match/index.js
Expand Up @@ -28,8 +28,34 @@ var matchMonthPatterns = {
wide: /^(janvier|février|mars|avril|mai|juin|juillet|août|septembre|octobre|novembre|décembre)/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, /^av/i, /^ma/i, /^jui/i, /^juil/i, /^au/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,
/^av/i,
/^ma/i,
/^juin/i,
/^juil/i,
/^ao/i,
/^s/i,
/^o/i,
/^n/i,
/^d/i
]
}

var matchDayPatterns = {
Expand Down Expand Up @@ -64,7 +90,7 @@ var match = {
ordinalNumber: buildMatchPatternFn({
matchPattern: matchOrdinalNumberPattern,
parsePattern: parseOrdinalNumberPattern,
valueCallback: function (value) {
valueCallback: function(value) {
return parseInt(value, 10)
}
}),
Expand All @@ -81,7 +107,7 @@ var match = {
defaultMatchWidth: 'wide',
parsePatterns: parseQuarterPatterns,
defaultParseWidth: 'any',
valueCallback: function (index) {
valueCallback: function(index) {
return index + 1
}
}),
Expand Down
8 changes: 4 additions & 4 deletions src/locale/fr/snapshot.md
Expand Up @@ -25,17 +25,17 @@
| Month (formatting) | Mo | 2019-02-11T12:13:14.015Z | 2ème | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | 7ème | 2019-07-01T00:00:00.000Z |
| | MMM | 2019-02-11T12:13:14.015Z | févr. | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | juil. | 2019-06-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | juil. | 2019-07-01T00:00:00.000Z |
| | MMMM | 2019-02-11T12:13:14.015Z | février | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | juillet | 2019-06-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | juillet | 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ème | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | 7ème | 2019-07-01T00:00:00.000Z |
| | LLL | 2019-02-11T12:13:14.015Z | févr. | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | juil. | 2019-06-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | juil. | 2019-07-01T00:00:00.000Z |
| | LLLL | 2019-02-11T12:13:14.015Z | février | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | juillet | 2019-06-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | juillet | 2019-07-01T00:00:00.000Z |
| | LLLLL | 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 |
| Local week of year | wo | 2019-01-01T12:13:14.015Z | 1ère | 2018-12-31T00:00:00.000Z |
Expand Down

0 comments on commit e7e4dcf

Please sign in to comment.