Skip to content

Commit d50e1fb

Browse files
mazipanmazipan
authored
Merge pull request #30 from mazipan/master
Fix presets i18n
2 parents d1e1cba + 4e6b127 commit d50e1fb

File tree

5 files changed

+271
-259
lines changed

5 files changed

+271
-259
lines changed

‎dist/vue-rangedate-picker.common.js‎

Lines changed: 68 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -401,69 +401,73 @@ var defaultStyle = {
401401
presetRanges: 'calendar_preset-ranges'
402402
};
403403

404-
var defaultPresets = {
405-
today: function () {
406-
var n = new Date();
407-
var startToday = new Date(n.getFullYear(), n.getMonth(), n.getDate() + 1, 0, 0);
408-
var endToday = new Date(n.getFullYear(), n.getMonth(), n.getDate() + 1, 23, 59);
409-
return {
410-
label: presetRangeLabel[defaultI18n].today,
411-
active: false,
412-
dateRange: {
413-
start: startToday,
414-
end: endToday
404+
var defaultPresets = function (i18n) {
405+
if ( i18n === void 0 ) i18n = defaultI18n;
406+
407+
return {
408+
today: function () {
409+
var n = new Date();
410+
var startToday = new Date(n.getFullYear(), n.getMonth(), n.getDate() + 1, 0, 0);
411+
var endToday = new Date(n.getFullYear(), n.getMonth(), n.getDate() + 1, 23, 59);
412+
return {
413+
label: presetRangeLabel[i18n].today,
414+
active: false,
415+
dateRange: {
416+
start: startToday,
417+
end: endToday
418+
}
415419
}
416-
}
417-
},
418-
thisMonth: function () {
419-
var n = new Date();
420-
var startMonth = new Date(n.getFullYear(), n.getMonth(), 2);
421-
var endMonth = new Date(n.getFullYear(), n.getMonth() + 1, 1);
422-
return {
423-
label: presetRangeLabel[defaultI18n].thisMonth,
424-
active: false,
425-
dateRange: {
426-
start: startMonth,
427-
end: endMonth
420+
},
421+
thisMonth: function () {
422+
var n = new Date();
423+
var startMonth = new Date(n.getFullYear(), n.getMonth(), 2);
424+
var endMonth = new Date(n.getFullYear(), n.getMonth() + 1, 1);
425+
return {
426+
label: presetRangeLabel[i18n].thisMonth,
427+
active: false,
428+
dateRange: {
429+
start: startMonth,
430+
end: endMonth
431+
}
428432
}
429-
}
430-
},
431-
lastMonth: function () {
432-
var n = new Date();
433-
var startMonth = new Date(n.getFullYear(), n.getMonth() - 1, 2);
434-
var endMonth = new Date(n.getFullYear(), n.getMonth(), 1);
435-
return {
436-
label: presetRangeLabel[defaultI18n].lastMonth,
437-
active: false,
438-
dateRange: {
439-
start: startMonth,
440-
end: endMonth
433+
},
434+
lastMonth: function () {
435+
var n = new Date();
436+
var startMonth = new Date(n.getFullYear(), n.getMonth() - 1, 2);
437+
var endMonth = new Date(n.getFullYear(), n.getMonth(), 1);
438+
return {
439+
label: presetRangeLabel[i18n].lastMonth,
440+
active: false,
441+
dateRange: {
442+
start: startMonth,
443+
end: endMonth
444+
}
441445
}
442-
}
443-
},
444-
last7days: function () {
445-
var n = new Date();
446-
var start = new Date(n.getFullYear(), n.getMonth(), n.getDate() - 5);
447-
var end = new Date(n.getFullYear(), n.getMonth(), n.getDate() + 1);
448-
return {
449-
label: presetRangeLabel[defaultI18n].lastSevenDays,
450-
active: false,
451-
dateRange: {
452-
start: start,
453-
end: end
446+
},
447+
last7days: function () {
448+
var n = new Date();
449+
var start = new Date(n.getFullYear(), n.getMonth(), n.getDate() - 5);
450+
var end = new Date(n.getFullYear(), n.getMonth(), n.getDate() + 1);
451+
return {
452+
label: presetRangeLabel[i18n].lastSevenDays,
453+
active: false,
454+
dateRange: {
455+
start: start,
456+
end: end
457+
}
454458
}
455-
}
456-
},
457-
last30days: function () {
458-
var n = new Date();
459-
var start = new Date(n.getFullYear(), n.getMonth(), n.getDate() - 29);
460-
var end = new Date(n.getFullYear(), n.getMonth(), n.getDate() + 1);
461-
return {
462-
label: presetRangeLabel[defaultI18n].lastThirtyDays,
463-
active: false,
464-
dateRange: {
465-
start: start,
466-
end: end
459+
},
460+
last30days: function () {
461+
var n = new Date();
462+
var start = new Date(n.getFullYear(), n.getMonth(), n.getDate() - 29);
463+
var end = new Date(n.getFullYear(), n.getMonth(), n.getDate() + 1);
464+
return {
465+
label: presetRangeLabel[i18n].lastThirtyDays,
466+
active: false,
467+
dateRange: {
468+
start: start,
469+
end: end
470+
}
467471
}
468472
}
469473
}
@@ -502,7 +506,7 @@ var __vue_module__ = {
502506
},
503507
initRange: {
504508
type: Object,
505-
default: null
509+
default: function () { return null; }
506510
},
507511
startActiveMonth: {
508512
type: Number,
@@ -514,7 +518,7 @@ var __vue_module__ = {
514518
},
515519
presetRanges: {
516520
type: Object,
517-
default: function () { return defaultPresets; }
521+
default: function () { return null; }
518522
},
519523
compact: {
520524
type: String,
@@ -568,11 +572,10 @@ var __vue_module__ = {
568572
return this.activeMonthStart >= 11 ? 0 : this.activeMonthStart + 1
569573
},
570574
finalPresetRanges: function () {
571-
var this$1 = this;
572-
573575
var tmp = {};
574-
for (var i in this$1.presetRanges) {
575-
var item = this$1.presetRanges[i];
576+
var presets = this.presetRanges || defaultPresets(this.i18n);
577+
for (var i in presets) {
578+
var item = presets[i];
576579
var plainItem = item;
577580
if (typeof item === 'function') {
578581
plainItem = item();

‎dist/vue-rangedate-picker.esm.js‎

Lines changed: 68 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -397,69 +397,73 @@ var defaultStyle = {
397397
presetRanges: 'calendar_preset-ranges'
398398
};
399399

400-
var defaultPresets = {
401-
today: function () {
402-
var n = new Date();
403-
var startToday = new Date(n.getFullYear(), n.getMonth(), n.getDate() + 1, 0, 0);
404-
var endToday = new Date(n.getFullYear(), n.getMonth(), n.getDate() + 1, 23, 59);
405-
return {
406-
label: presetRangeLabel[defaultI18n].today,
407-
active: false,
408-
dateRange: {
409-
start: startToday,
410-
end: endToday
400+
var defaultPresets = function (i18n) {
401+
if ( i18n === void 0 ) i18n = defaultI18n;
402+
403+
return {
404+
today: function () {
405+
var n = new Date();
406+
var startToday = new Date(n.getFullYear(), n.getMonth(), n.getDate() + 1, 0, 0);
407+
var endToday = new Date(n.getFullYear(), n.getMonth(), n.getDate() + 1, 23, 59);
408+
return {
409+
label: presetRangeLabel[i18n].today,
410+
active: false,
411+
dateRange: {
412+
start: startToday,
413+
end: endToday
414+
}
411415
}
412-
}
413-
},
414-
thisMonth: function () {
415-
var n = new Date();
416-
var startMonth = new Date(n.getFullYear(), n.getMonth(), 2);
417-
var endMonth = new Date(n.getFullYear(), n.getMonth() + 1, 1);
418-
return {
419-
label: presetRangeLabel[defaultI18n].thisMonth,
420-
active: false,
421-
dateRange: {
422-
start: startMonth,
423-
end: endMonth
416+
},
417+
thisMonth: function () {
418+
var n = new Date();
419+
var startMonth = new Date(n.getFullYear(), n.getMonth(), 2);
420+
var endMonth = new Date(n.getFullYear(), n.getMonth() + 1, 1);
421+
return {
422+
label: presetRangeLabel[i18n].thisMonth,
423+
active: false,
424+
dateRange: {
425+
start: startMonth,
426+
end: endMonth
427+
}
424428
}
425-
}
426-
},
427-
lastMonth: function () {
428-
var n = new Date();
429-
var startMonth = new Date(n.getFullYear(), n.getMonth() - 1, 2);
430-
var endMonth = new Date(n.getFullYear(), n.getMonth(), 1);
431-
return {
432-
label: presetRangeLabel[defaultI18n].lastMonth,
433-
active: false,
434-
dateRange: {
435-
start: startMonth,
436-
end: endMonth
429+
},
430+
lastMonth: function () {
431+
var n = new Date();
432+
var startMonth = new Date(n.getFullYear(), n.getMonth() - 1, 2);
433+
var endMonth = new Date(n.getFullYear(), n.getMonth(), 1);
434+
return {
435+
label: presetRangeLabel[i18n].lastMonth,
436+
active: false,
437+
dateRange: {
438+
start: startMonth,
439+
end: endMonth
440+
}
437441
}
438-
}
439-
},
440-
last7days: function () {
441-
var n = new Date();
442-
var start = new Date(n.getFullYear(), n.getMonth(), n.getDate() - 5);
443-
var end = new Date(n.getFullYear(), n.getMonth(), n.getDate() + 1);
444-
return {
445-
label: presetRangeLabel[defaultI18n].lastSevenDays,
446-
active: false,
447-
dateRange: {
448-
start: start,
449-
end: end
442+
},
443+
last7days: function () {
444+
var n = new Date();
445+
var start = new Date(n.getFullYear(), n.getMonth(), n.getDate() - 5);
446+
var end = new Date(n.getFullYear(), n.getMonth(), n.getDate() + 1);
447+
return {
448+
label: presetRangeLabel[i18n].lastSevenDays,
449+
active: false,
450+
dateRange: {
451+
start: start,
452+
end: end
453+
}
450454
}
451-
}
452-
},
453-
last30days: function () {
454-
var n = new Date();
455-
var start = new Date(n.getFullYear(), n.getMonth(), n.getDate() - 29);
456-
var end = new Date(n.getFullYear(), n.getMonth(), n.getDate() + 1);
457-
return {
458-
label: presetRangeLabel[defaultI18n].lastThirtyDays,
459-
active: false,
460-
dateRange: {
461-
start: start,
462-
end: end
455+
},
456+
last30days: function () {
457+
var n = new Date();
458+
var start = new Date(n.getFullYear(), n.getMonth(), n.getDate() - 29);
459+
var end = new Date(n.getFullYear(), n.getMonth(), n.getDate() + 1);
460+
return {
461+
label: presetRangeLabel[i18n].lastThirtyDays,
462+
active: false,
463+
dateRange: {
464+
start: start,
465+
end: end
466+
}
463467
}
464468
}
465469
}
@@ -498,7 +502,7 @@ var __vue_module__ = {
498502
},
499503
initRange: {
500504
type: Object,
501-
default: null
505+
default: function () { return null; }
502506
},
503507
startActiveMonth: {
504508
type: Number,
@@ -510,7 +514,7 @@ var __vue_module__ = {
510514
},
511515
presetRanges: {
512516
type: Object,
513-
default: function () { return defaultPresets; }
517+
default: function () { return null; }
514518
},
515519
compact: {
516520
type: String,
@@ -564,11 +568,10 @@ var __vue_module__ = {
564568
return this.activeMonthStart >= 11 ? 0 : this.activeMonthStart + 1
565569
},
566570
finalPresetRanges: function () {
567-
var this$1 = this;
568-
569571
var tmp = {};
570-
for (var i in this$1.presetRanges) {
571-
var item = this$1.presetRanges[i];
572+
var presets = this.presetRanges || defaultPresets(this.i18n);
573+
for (var i in presets) {
574+
var item = presets[i];
572575
var plainItem = item;
573576
if (typeof item === 'function') {
574577
plainItem = item();

0 commit comments

Comments
 (0)