potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

Issue #1511 tzOffset need to use browserTimeZone and not userActualTimezone

Browse source 
Javascript Date() objects are based on "the host environment (user's device)".

https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date
This commit is contained in:
Massedil 2024-11-01 19:04:39 +01:00
parent 0073a77167
commit 3f65781d27
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/views/Event/EditView.vue
View file

@ -1313,24 +1313,35 @@ const timezone = computed({
}, },
}); });
// Timezone specified in user settings
const userTimezone = computed((): string | undefined => { const userTimezone = computed((): string | undefined => {
return loggedUser.value?.settings?.timezone; return loggedUser.value?.settings?.timezone;
}); });
const browserTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
// Timezone specified in user settings or local timezone browser if unavailable
const userActualTimezone = computed((): string => { const userActualTimezone = computed((): string => {
if (userTimezone.value) { if (userTimezone.value) {
return userTimezone.value; return userTimezone.value;
} }
return Intl.DateTimeFormat().resolvedOptions().timeZone; return browserTimeZone;
}); });
const tzOffset = (date: Date | null): number => { const tzOffset = (date: Date | null): number => {
if (timezone.value && date) { if (!timezone.value || !date) {
const eventUTCOffset = getTimezoneOffset(timezone.value, date); return 0;
const localUTCOffset = getTimezoneOffset(userActualTimezone.value, date);
return (eventUTCOffset - localUTCOffset) / (60 * 1000);
} }
return 0; // diff between UTC and selected timezone
// example: Asia/Shanghai is + 8 hours
const eventUTCOffset = getTimezoneOffset(timezone.value, date);
// diff between UTC and local browser timezone
// example: Europe/Paris is + 1 hour (or +2 depending of daylight saving time)
const localUTCOffset = getTimezoneOffset(browserTimeZone, date);
// example : offset is 8-1=7
return (eventUTCOffset - localUTCOffset) / (60 * 1000);
}; };
const eventPhysicalAddress = computed({ const eventPhysicalAddress = computed({