Skip to content

Commit 36a5ad7

Browse files
committed
🐛(Dates): Fixed lang in date range
1 parent c2e519e commit 36a5ad7

File tree

7 files changed

+22
-20
lines changed

7 files changed

+22
-20
lines changed

.size-snapshot.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
{
22
"dist/vue-datepicker.min.js": {
3-
"bundled": 140715,
4-
"minified": 80242,
5-
"gzipped": 20709
3+
"bundled": 140699,
4+
"minified": 80233,
5+
"gzipped": 20705
66
},
77
"dist/vue-datepicker.esm.js": {
8-
"bundled": 140701,
9-
"minified": 86496,
10-
"gzipped": 21835,
8+
"bundled": 140685,
9+
"minified": 86487,
10+
"gzipped": 21833,
1111
"treeshaked": {
1212
"rollup": {
13-
"code": 80060,
13+
"code": 80051,
1414
"import_statements": 144
1515
},
1616
"webpack": {
17-
"code": 81197
17+
"code": 81190
1818
}
1919
}
2020
},
2121
"dist/vue-datepicker.umd.js": {
22-
"bundled": 149852,
23-
"minified": 80539,
24-
"gzipped": 20830
22+
"bundled": 149834,
23+
"minified": 80530,
24+
"gzipped": 20825
2525
}
2626
}

dist/vue-datepicker.esm.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vue-datepicker.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vue-datepicker.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vue-datepicker.umd.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/utils/Dates.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,23 +177,23 @@ export function getWeekDays ({ lang, weekDays }) {
177177
return weekDays || weekDaysShort;
178178
}
179179

180-
export function getRangeDatesFormatted ({ start, end } = {}, { lang }, format) {
180+
export function getRangeDatesFormatted ({ start, end } = {}, locale, format) {
181181
if (!start && !end) {
182182
return `__ ~ __`;
183183
}
184184

185185
if (!start && end) {
186-
return `__ ~ ${generateDate(end, lang).startOf('day').format(format)}`;
186+
return `__ ~ ${generateDate(end, locale).startOf('day').format(format)}`;
187187
}
188188

189189
if (start && !end) {
190-
return `${generateDate(start, lang).startOf('day').format(format)} ~ __`;
190+
return `${generateDate(start, locale).startOf('day').format(format)} ~ __`;
191191
}
192192

193193
return `\
194-
${generateDate(start, lang).startOf('day').format(format)} \
194+
${generateDate(start, locale).startOf('day').format(format)} \
195195
~ \
196-
${generateDate(end, lang).startOf('day').format(format)}`;
196+
${generateDate(end, locale).startOf('day').format(format)}`;
197197
}
198198

199199
// -----------------------------------------

tests/unit/utils/Dates.spec.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,8 @@ describe('Dates: Functions', () => {
387387
[{ start: undefined, end: '2019-5-15' }, { lang: en }, 'YYYY-MM-DD', '__ ~ 2019-05-15'],
388388
[{ start: '2019-5-15', end: undefined }, { lang: en }, 'YYYY-MM-DD', '2019-05-15 ~ __'],
389389
[{ start: '2019-5-15', end: '2019-5-17' }, { lang: en }, 'YYYY-MM-DD', '2019-05-15 ~ 2019-05-17'],
390+
[{ start: '2019-5-15', end: '2019-5-17' }, { lang: en }, 'DD MMMM', '15 May ~ 17 May'],
391+
[{ start: '2019-5-15', end: '2019-5-17' }, { lang: fr }, 'DD MMMM', '15 Mai ~ 17 Mai'],
390392
])(
391393
'when year = %p, month = %p should return %p when formatted with YYYY-MM',
392394
(dates, locale, format, expectedResult) => {

0 commit comments

Comments
 (0)