fix the problem that system default timezone is not browser timezone when custom timezone is set

This commit is contained in:
MaysWind
2023-06-24 18:39:55 +08:00
parent 10df947efe
commit 0efe617c03
2 changed files with 8 additions and 2 deletions
+4
View File
@@ -49,6 +49,10 @@ export function getTimezoneOffsetMinutes(timezone) {
return getUtcOffsetMinutesByUtcOffset(utcOffset); return getUtcOffsetMinutesByUtcOffset(utcOffset);
} }
export function getBrowserTimezoneOffset() {
return getUtcOffsetByUtcOffsetMinutes(getBrowserTimezoneOffsetMinutes());
}
export function getBrowserTimezoneOffsetMinutes() { export function getBrowserTimezoneOffsetMinutes() {
return -new Date().getTimezoneOffset(); return -new Date().getTimezoneOffset();
} }
+4 -2
View File
@@ -16,6 +16,8 @@ import {
getCurrentDateTime, getCurrentDateTime,
getTimezoneOffset, getTimezoneOffset,
getTimezoneOffsetMinutes, getTimezoneOffsetMinutes,
getBrowserTimezoneOffset,
getBrowserTimezoneOffsetMinutes,
getDateTimeFormatType getDateTimeFormatType
} from './datetime.js'; } from './datetime.js';
@@ -433,8 +435,8 @@ function getDateTimeFormat(translateFn, allFormatMap, allFormatArray, localeForm
} }
function getAllTimezones(includeSystemDefault, translateFn) { function getAllTimezones(includeSystemDefault, translateFn) {
const defaultTimezoneOffset = getTimezoneOffset(); const defaultTimezoneOffset = getBrowserTimezoneOffset();
const defaultTimezoneOffsetMinutes = getTimezoneOffsetMinutes(); const defaultTimezoneOffsetMinutes = getBrowserTimezoneOffsetMinutes();
const allTimezones = timezone.all; const allTimezones = timezone.all;
const allTimezoneInfos = []; const allTimezoneInfos = [];