@@ -64,8 +62,7 @@
@@ -86,8 +83,7 @@
-
+
@@ -145,9 +141,10 @@ export default {
}
},
computed: {
- ...mapGetters([
- 'trashBin',
- ]),
+ ...mapGetters({
+ trashBin: 'trashBin',
+ timezoneObject: 'getResolvedTimezoneObject',
+ }),
calendars() {
return this.$store.getters.sortedDeletedCalendars
},
@@ -174,10 +171,11 @@ export default {
let subline = vobject.calendar?.displayName || t('calendar', 'Unknown calendar')
if (vobject.isEvent) {
const event = vobject?.calendarComponent.getFirstComponent('VEVENT')
+ const utcOffset = (event?.startDate.getInTimezone(this.timezoneObject).utcOffset() ?? 0) / 60
if (event?.startDate.jsDate && event?.isAllDay()) {
- subline += ' · ' + moment(event.startDate.jsDate).format('LL')
+ subline += ' · ' + moment(event.startDate.jsDate).utcOffset(utcOffset).format('LL')
} else if (event?.startDate.jsDate) {
- subline += ' · ' + moment(event?.startDate.jsDate).format('LLL')
+ subline += ' · ' + moment(event?.startDate.jsDate).utcOffset(utcOffset).format('LLL')
}
}
const color = vobject.calendarComponent.getComponentIterator().next().value?.color
@@ -285,7 +283,6 @@ export default {
diff --git a/src/components/Shared/CalendarPicker.vue b/src/components/Shared/CalendarPicker.vue
index d576d5fd93f96f5b8c839d05993d612e3ac2f977..80ea49fdd8b0834609e06f264caed828eb69435a 100644
--- a/src/components/Shared/CalendarPicker.vue
+++ b/src/components/Shared/CalendarPicker.vue
@@ -1,6 +1,5 @@
-
-
-
+
{{ displayName }}
-
-
+ @pick="pickDate"
+ confirm>
-
-
-
- |