Skip to content

Commit 8623e83

Browse files
author
Irfan Maulana
committed
fix i18n
1 parent 1be28e3 commit 8623e83

File tree

6 files changed

+290
-300
lines changed

6 files changed

+290
-300
lines changed

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

Lines changed: 72 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -401,77 +401,75 @@ var defaultStyle = {
401401
presetRanges: 'calendar_preset-ranges'
402402
};
403403

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-
}
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
417415
}
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-
}
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
430428
}
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-
}
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
443441
}
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-
}
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
456454
}
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-
}
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
469467
}
470468
}
471469
}
472470
};
473471

474-
var RangedatePicker$1 = {
472+
var __vue_module__ = {
475473
props: {
476474
configs: {
477475
type: Object,
@@ -483,15 +481,11 @@ var RangedatePicker$1 = {
483481
},
484482
months: {
485483
type: Array,
486-
default: function () {
487-
return availableMonths[RangedatePicker$1.props.i18n]
488-
}
484+
default: function () { return null; }
489485
},
490486
shortDays: {
491487
type: Array,
492-
default: function () {
493-
return availableShortDays[RangedatePicker$1.props.i18n]
494-
}
488+
default: function () { return null; }
495489
},
496490
// options for captions are: title, ok_button
497491
captions: {
@@ -520,9 +514,7 @@ var RangedatePicker$1 = {
520514
},
521515
presetRanges: {
522516
type: Object,
523-
default: function () {
524-
return defaultPresets[RangedatePicker$1.props.i18n]
525-
}
517+
default: function () { return defaultPresets; }
526518
},
527519
compact: {
528520
type: String,
@@ -551,6 +543,12 @@ var RangedatePicker$1 = {
551543
}
552544
},
553545
computed: {
546+
monthsLocale: function () {
547+
return this.months || availableMonths[this.i18n]
548+
},
549+
shortDaysLocale: function () {
550+
return this.shortDays || availableShortDays[this.i18n]
551+
},
554552
s: function () {
555553
return Object.assign({}, defaultStyle, this.style)
556554
},
@@ -706,10 +704,10 @@ var RangedatePicker$1 = {
706704
}
707705
};
708706

709-
var __$__vue_module__ = Object.assign(RangedatePicker$1, {render: function(){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"calendar-root"},[_c('div',{staticClass:"input-date",on:{"click":function($event){_vm.toggleCalendar();}}},[_vm._v(" "+_vm._s(_vm.getDateString(_vm.dateRange.start))+" - "+_vm._s(_vm.getDateString(_vm.dateRange.end)))]),_vm._v(" "),(_vm.isOpen)?_c('div',{staticClass:"calendar",class:{'calendar-mobile ': _vm.isCompact, 'calendar-right-to-left': _vm.isRighttoLeft}},[(!_vm.isCompact)?_c('div',{staticClass:"calendar-head"},[_c('h2',[_vm._v(_vm._s(_vm.captions.title))]),_vm._v(" "),_c('i',{staticClass:"close",on:{"click":function($event){_vm.toggleCalendar();}}})]):_vm._e(),_vm._v(" "),_c('div',{staticClass:"calendar-wrap"},[(_vm.showMonth)?_c('div',{staticClass:"calendar_month_left",class:{'calendar-left-mobile': _vm.isCompact}},[_c('div',{staticClass:"months-text"},[_c('i',{staticClass:"left",on:{"click":_vm.goPrevMonth}}),_vm._v(" "),(_vm.isCompact)?_c('i',{staticClass:"right",on:{"click":_vm.goNextMonth}}):_vm._e(),_vm._v(" "+_vm._s(_vm.months[_vm.activeMonthStart] +' '+ _vm.startActiveYear))]),_vm._v(" "),_c('ul',{class:_vm.s.daysWeeks},_vm._l((_vm.shortDays),function(item){return _c('li',[_vm._v(_vm._s(item))])})),_vm._v(" "),_vm._l((6),function(r){return _c('ul',{class:[_vm.s.days]},_vm._l((_vm.numOfDays),function(i){return _c('li',{class:[( obj = {}, obj[_vm.s.daysSelected] = _vm.isDateSelected(r, i, 'first', _vm.startMonthDay, _vm.endMonthDate), obj[_vm.s.daysInRange] = _vm.isDateInRange(r, i, 'first', _vm.startMonthDay, _vm.endMonthDate), obj )],domProps:{"innerHTML":_vm._s(_vm.getDayCell(r, i, _vm.startMonthDay, _vm.endMonthDate))},on:{"click":function($event){_vm.selectFirstItem(r, i);}}})
710-
var obj;}))})],2):_vm._e(),_vm._v(" "),(!_vm.isCompact)?_c('div',{staticClass:"calendar_month_right"},[_c('div',{staticClass:"months-text"},[_vm._v(" "+_vm._s(_vm.months[_vm.startNextActiveMonth] +' '+ _vm.startActiveYear)+" "),_c('i',{staticClass:"right",on:{"click":_vm.goNextMonth}})]),_vm._v(" "),_c('ul',{class:_vm.s.daysWeeks},_vm._l((_vm.shortDays),function(item){return _c('li',[_vm._v(_vm._s(item))])})),_vm._v(" "),_vm._l((6),function(r){return _c('ul',{class:[_vm.s.days]},_vm._l((_vm.numOfDays),function(i){return _c('li',{class:[( obj = {}, obj[_vm.s.daysSelected] = _vm.isDateSelected(r, i, 'second', _vm.startNextMonthDay, _vm.endNextMonthDate), obj[_vm.s.daysInRange] = _vm.isDateInRange(r, i, 'second', _vm.startNextMonthDay, _vm.endNextMonthDate), obj )],domProps:{"innerHTML":_vm._s(_vm.getDayCell(r, i, _vm.startNextMonthDay, _vm.endNextMonthDate))},on:{"click":function($event){_vm.selectSecondItem(r, i);}}})
707+
var __$__vue_module__ = Object.assign(__vue_module__, {render: function(){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"calendar-root"},[_c('div',{staticClass:"input-date",on:{"click":function($event){_vm.toggleCalendar();}}},[_vm._v(" "+_vm._s(_vm.getDateString(_vm.dateRange.start))+" - "+_vm._s(_vm.getDateString(_vm.dateRange.end)))]),_vm._v(" "),(_vm.isOpen)?_c('div',{staticClass:"calendar",class:{'calendar-mobile ': _vm.isCompact, 'calendar-right-to-left': _vm.isRighttoLeft}},[(!_vm.isCompact)?_c('div',{staticClass:"calendar-head"},[_c('h2',[_vm._v(_vm._s(_vm.captions.title))]),_vm._v(" "),_c('i',{staticClass:"close",on:{"click":function($event){_vm.toggleCalendar();}}})]):_vm._e(),_vm._v(" "),_c('div',{staticClass:"calendar-wrap"},[(_vm.showMonth)?_c('div',{staticClass:"calendar_month_left",class:{'calendar-left-mobile': _vm.isCompact}},[_c('div',{staticClass:"months-text"},[_c('i',{staticClass:"left",on:{"click":_vm.goPrevMonth}}),_vm._v(" "),(_vm.isCompact)?_c('i',{staticClass:"right",on:{"click":_vm.goNextMonth}}):_vm._e(),_vm._v(" "+_vm._s(_vm.monthsLocale[_vm.activeMonthStart] +' '+ _vm.startActiveYear))]),_vm._v(" "),_c('ul',{class:_vm.s.daysWeeks},_vm._l((_vm.shortDaysLocale),function(item){return _c('li',[_vm._v(_vm._s(item))])})),_vm._v(" "),_vm._l((6),function(r){return _c('ul',{class:[_vm.s.days]},_vm._l((_vm.numOfDays),function(i){return _c('li',{class:[( obj = {}, obj[_vm.s.daysSelected] = _vm.isDateSelected(r, i, 'first', _vm.startMonthDay, _vm.endMonthDate), obj[_vm.s.daysInRange] = _vm.isDateInRange(r, i, 'first', _vm.startMonthDay, _vm.endMonthDate), obj )],domProps:{"innerHTML":_vm._s(_vm.getDayCell(r, i, _vm.startMonthDay, _vm.endMonthDate))},on:{"click":function($event){_vm.selectFirstItem(r, i);}}})
708+
var obj;}))})],2):_vm._e(),_vm._v(" "),(!_vm.isCompact)?_c('div',{staticClass:"calendar_month_right"},[_c('div',{staticClass:"months-text"},[_vm._v(" "+_vm._s(_vm.monthsLocale[_vm.startNextActiveMonth] +' '+ _vm.startActiveYear)+" "),_c('i',{staticClass:"right",on:{"click":_vm.goNextMonth}})]),_vm._v(" "),_c('ul',{class:_vm.s.daysWeeks},_vm._l((_vm.shortDaysLocale),function(item){return _c('li',[_vm._v(_vm._s(item))])})),_vm._v(" "),_vm._l((6),function(r){return _c('ul',{class:[_vm.s.days]},_vm._l((_vm.numOfDays),function(i){return _c('li',{class:[( obj = {}, obj[_vm.s.daysSelected] = _vm.isDateSelected(r, i, 'second', _vm.startNextMonthDay, _vm.endNextMonthDate), obj[_vm.s.daysInRange] = _vm.isDateInRange(r, i, 'second', _vm.startNextMonthDay, _vm.endNextMonthDate), obj )],domProps:{"innerHTML":_vm._s(_vm.getDayCell(r, i, _vm.startNextMonthDay, _vm.endNextMonthDate))},on:{"click":function($event){_vm.selectSecondItem(r, i);}}})
711709
var obj;}))})],2):_vm._e()]),_vm._v(" "),(!_vm.showMonth || !_vm.isCompact)?_c('div',{staticClass:"calendar-range",class:{'calendar-range-mobile ': _vm.isCompact}},[_c('ul',{staticClass:"calendar_preset"},[_vm._l((_vm.finalPresetRanges),function(item,idx){return _c('li',{key:idx,staticClass:"calendar_preset-ranges",class:{'active-preset': _vm.presetActive === item.label},on:{"click":function($event){_vm.updatePreset(item);}}},[_vm._v(" "+_vm._s(item.label)+" ")])}),_vm._v(" "),_c('li',[_c('button',{staticClass:"calendar-btn-apply",on:{"click":function($event){_vm.setDateValue();}}},[_vm._v(_vm._s(_vm.captions.ok_button))])])],2)]):_vm._e()]):_vm._e()])},staticRenderFns: [],_scopeId: 'data-v-5e837f70',});
712-
__$__vue_module__.prototype = RangedatePicker$1.prototype;
710+
__$__vue_module__.prototype = __vue_module__.prototype;
713711

714712
function plugin (Vue) {
715713
Vue.component('rangedate-picker', __$__vue_module__);

0 commit comments

Comments
 (0)