Skip to content

Commit 34ac830

Browse files
author
Irfan Maulana
committed
#29 [fix] fix i18n in presets
1 parent 8623e83 commit 34ac830

File tree

5 files changed

+261
-255
lines changed

5 files changed

+261
-255
lines changed

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

Lines changed: 65 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -401,69 +401,71 @@ 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+
return {
406+
today: function () {
407+
var n = new Date();
408+
var startToday = new Date(n.getFullYear(), n.getMonth(), n.getDate() + 1, 0, 0);
409+
var endToday = new Date(n.getFullYear(), n.getMonth(), n.getDate() + 1, 23, 59);
410+
return {
411+
label: presetRangeLabel[i18n].today,
412+
active: false,
413+
dateRange: {
414+
start: startToday,
415+
end: endToday
416+
}
415417
}
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
418+
},
419+
thisMonth: function () {
420+
var n = new Date();
421+
var startMonth = new Date(n.getFullYear(), n.getMonth(), 2);
422+
var endMonth = new Date(n.getFullYear(), n.getMonth() + 1, 1);
423+
return {
424+
label: presetRangeLabel[i18n].thisMonth,
425+
active: false,
426+
dateRange: {
427+
start: startMonth,
428+
end: endMonth
429+
}
428430
}
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
431+
},
432+
lastMonth: function () {
433+
var n = new Date();
434+
var startMonth = new Date(n.getFullYear(), n.getMonth() - 1, 2);
435+
var endMonth = new Date(n.getFullYear(), n.getMonth(), 1);
436+
return {
437+
label: presetRangeLabel[i18n].lastMonth,
438+
active: false,
439+
dateRange: {
440+
start: startMonth,
441+
end: endMonth
442+
}
441443
}
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
444+
},
445+
last7days: function () {
446+
var n = new Date();
447+
var start = new Date(n.getFullYear(), n.getMonth(), n.getDate() - 5);
448+
var end = new Date(n.getFullYear(), n.getMonth(), n.getDate() + 1);
449+
return {
450+
label: presetRangeLabel[i18n].lastSevenDays,
451+
active: false,
452+
dateRange: {
453+
start: start,
454+
end: end
455+
}
454456
}
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
457+
},
458+
last30days: function () {
459+
var n = new Date();
460+
var start = new Date(n.getFullYear(), n.getMonth(), n.getDate() - 29);
461+
var end = new Date(n.getFullYear(), n.getMonth(), n.getDate() + 1);
462+
return {
463+
label: presetRangeLabel[i18n].lastThirtyDays,
464+
active: false,
465+
dateRange: {
466+
start: start,
467+
end: end
468+
}
467469
}
468470
}
469471
}
@@ -514,7 +516,7 @@ var __vue_module__ = {
514516
},
515517
presetRanges: {
516518
type: Object,
517-
default: function () { return defaultPresets; }
519+
default: {}
518520
},
519521
compact: {
520522
type: String,
@@ -568,11 +570,10 @@ var __vue_module__ = {
568570
return this.activeMonthStart >= 11 ? 0 : this.activeMonthStart + 1
569571
},
570572
finalPresetRanges: function () {
571-
var this$1 = this;
572-
573573
var tmp = {};
574-
for (var i in this$1.presetRanges) {
575-
var item = this$1.presetRanges[i];
574+
var presets = this.presetRanges || defaultPresets(this.i18n);
575+
for (var i in presets) {
576+
var item = presets[i];
576577
var plainItem = item;
577578
if (typeof item === 'function') {
578579
plainItem = item();

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

Lines changed: 65 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -397,69 +397,71 @@ 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+
return {
402+
today: function () {
403+
var n = new Date();
404+
var startToday = new Date(n.getFullYear(), n.getMonth(), n.getDate() + 1, 0, 0);
405+
var endToday = new Date(n.getFullYear(), n.getMonth(), n.getDate() + 1, 23, 59);
406+
return {
407+
label: presetRangeLabel[i18n].today,
408+
active: false,
409+
dateRange: {
410+
start: startToday,
411+
end: endToday
412+
}
411413
}
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
414+
},
415+
thisMonth: function () {
416+
var n = new Date();
417+
var startMonth = new Date(n.getFullYear(), n.getMonth(), 2);
418+
var endMonth = new Date(n.getFullYear(), n.getMonth() + 1, 1);
419+
return {
420+
label: presetRangeLabel[i18n].thisMonth,
421+
active: false,
422+
dateRange: {
423+
start: startMonth,
424+
end: endMonth
425+
}
424426
}
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
427+
},
428+
lastMonth: function () {
429+
var n = new Date();
430+
var startMonth = new Date(n.getFullYear(), n.getMonth() - 1, 2);
431+
var endMonth = new Date(n.getFullYear(), n.getMonth(), 1);
432+
return {
433+
label: presetRangeLabel[i18n].lastMonth,
434+
active: false,
435+
dateRange: {
436+
start: startMonth,
437+
end: endMonth
438+
}
437439
}
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
440+
},
441+
last7days: function () {
442+
var n = new Date();
443+
var start = new Date(n.getFullYear(), n.getMonth(), n.getDate() - 5);
444+
var end = new Date(n.getFullYear(), n.getMonth(), n.getDate() + 1);
445+
return {
446+
label: presetRangeLabel[i18n].lastSevenDays,
447+
active: false,
448+
dateRange: {
449+
start: start,
450+
end: end
451+
}
450452
}
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
453+
},
454+
last30days: function () {
455+
var n = new Date();
456+
var start = new Date(n.getFullYear(), n.getMonth(), n.getDate() - 29);
457+
var end = new Date(n.getFullYear(), n.getMonth(), n.getDate() + 1);
458+
return {
459+
label: presetRangeLabel[i18n].lastThirtyDays,
460+
active: false,
461+
dateRange: {
462+
start: start,
463+
end: end
464+
}
463465
}
464466
}
465467
}
@@ -510,7 +512,7 @@ var __vue_module__ = {
510512
},
511513
presetRanges: {
512514
type: Object,
513-
default: function () { return defaultPresets; }
515+
default: {}
514516
},
515517
compact: {
516518
type: String,
@@ -564,11 +566,10 @@ var __vue_module__ = {
564566
return this.activeMonthStart >= 11 ? 0 : this.activeMonthStart + 1
565567
},
566568
finalPresetRanges: function () {
567-
var this$1 = this;
568-
569569
var tmp = {};
570-
for (var i in this$1.presetRanges) {
571-
var item = this$1.presetRanges[i];
570+
var presets = this.presetRanges || defaultPresets(this.i18n);
571+
for (var i in presets) {
572+
var item = presets[i];
572573
var plainItem = item;
573574
if (typeof item === 'function') {
574575
plainItem = item();

0 commit comments

Comments
 (0)