From 2c60ef6fc0371c6bba822a88016212407cfdf593 Mon Sep 17 00:00:00 2001
From: Suphat W <suphat.programmer@gmail.com>
Date: Thu, 14 Nov 2019 16:49:59 +0700
Subject: [PATCH 1/2] year value from Settings.defaultOuputCalendar

---
 src/DatetimePopup.vue      | 10 ++++++++--
 src/DatetimeYearPicker.vue | 12 ++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/DatetimePopup.vue b/src/DatetimePopup.vue
index 5f62913..7c82b54 100644
--- a/src/DatetimePopup.vue
+++ b/src/DatetimePopup.vue
@@ -2,7 +2,7 @@
   <div class="vdatetime-popup">
     <div class="vdatetime-popup__header">
       <div class="vdatetime-popup__title" v-if="title">{{ title }}</div>
-      <div class="vdatetime-popup__year" @click="showYear" v-if="type !== 'time'">{{ year }}</div>
+      <div class="vdatetime-popup__year" @click="showYear" v-if="type !== 'time'">{{ yearLocal }}</div>
       <div class="vdatetime-popup__date" @click="showMonth" v-if="type !== 'time'">{{ dateFormatted }}</div>
     </div>
     <div class="vdatetime-popup__body">
@@ -52,7 +52,7 @@
 </template>
 
 <script>
-import { DateTime } from 'luxon'
+import { DateTime, Settings } from 'luxon'
 import { createFlowManager, createFlowManagerFromType } from './util'
 import DatetimeCalendar from './DatetimeCalendar'
 import DatetimeTimePicker from './DatetimeTimePicker'
@@ -150,6 +150,12 @@ export default {
     year () {
       return this.newDatetime.year
     },
+    yearLocal() {
+      let yearString = this.newDatetime
+        .reconfigure({ outputCalendar: Settings.defaultOuputCalendar })
+        .toFormat("yyyy");
+      return parseInt(yearString);
+    },
     month () {
       return this.newDatetime.month
     },
diff --git a/src/DatetimeYearPicker.vue b/src/DatetimeYearPicker.vue
index a817543..d0af22f 100644
--- a/src/DatetimeYearPicker.vue
+++ b/src/DatetimeYearPicker.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="vdatetime-year-picker">
     <div class="vdatetime-year-picker__list vdatetime-year-picker__list" ref="yearList">
-      <div class="vdatetime-year-picker__item" v-for="year in years" @click="select(year)" :class="{'vdatetime-year-picker__item--selected': year.selected, 'vdatetime-year-picker__item--disabled': year.disabled}">{{ year.number }}
+      <div class="vdatetime-year-picker__item" v-for="year in years" @click="select(year)" :class="{'vdatetime-year-picker__item--selected': year.selected, 'vdatetime-year-picker__item--disabled': year.disabled}">{{ yearLocal(year.number) }}
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import { DateTime } from 'luxon'
+import { DateTime, Settings } from 'luxon'
 import { yearIsDisabled, years } from './util'
 
 export default {
@@ -51,6 +51,14 @@ export default {
         const selectedYear = this.$refs.yearList.querySelector('.vdatetime-year-picker__item--selected')
         this.$refs.yearList.scrollTop = selectedYear ? selectedYear.offsetTop - 250 : 0
       }
+    },
+
+    yearLocal(year) {
+      const current = DateTime.fromFormat(`${year}`, "yyyy");
+      let yearString = current
+        .reconfigure({ outputCalendar: Settings.defaultOuputCalendar })
+        .toFormat("yyyy");
+      return parseInt(yearString);
     }
   },
 

From c01abe09d2afe9fd5d6bca4c8d4cf8a7c51c303d Mon Sep 17 00:00:00 2001
From: Suphat W <suphat.programmer@gmail.com>
Date: Thu, 14 Nov 2019 17:48:25 +0700
Subject: [PATCH 2/2] fixbug eslint

---
 src/DatetimePopup.vue      |  8 ++++----
 src/DatetimeYearPicker.vue | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/DatetimePopup.vue b/src/DatetimePopup.vue
index 7c82b54..a03721b 100644
--- a/src/DatetimePopup.vue
+++ b/src/DatetimePopup.vue
@@ -150,11 +150,11 @@ export default {
     year () {
       return this.newDatetime.year
     },
-    yearLocal() {
-      let yearString = this.newDatetime
+    yearLocal () {
+      const yearString = this.newDatetime
         .reconfigure({ outputCalendar: Settings.defaultOuputCalendar })
-        .toFormat("yyyy");
-      return parseInt(yearString);
+        .toFormat('yyyy')
+      return parseInt(yearString)
     },
     month () {
       return this.newDatetime.month
diff --git a/src/DatetimeYearPicker.vue b/src/DatetimeYearPicker.vue
index d0af22f..c5aa9ff 100644
--- a/src/DatetimeYearPicker.vue
+++ b/src/DatetimeYearPicker.vue
@@ -53,12 +53,12 @@ export default {
       }
     },
 
-    yearLocal(year) {
-      const current = DateTime.fromFormat(`${year}`, "yyyy");
-      let yearString = current
+    yearLocal (year) {
+      const current = DateTime.fromFormat(year.toString(), 'yyyy')
+      const yearString = current
         .reconfigure({ outputCalendar: Settings.defaultOuputCalendar })
-        .toFormat("yyyy");
-      return parseInt(yearString);
+        .toFormat('yyyy')
+      return parseInt(yearString)
     }
   },