|
@@ -15,7 +15,8 @@ export const formatTimezone = (time: string, timezone?: string) => {
|
|
|
return formattedTime
|
|
return formattedTime
|
|
|
}
|
|
}
|
|
|
let utcOffset = ''
|
|
let utcOffset = ''
|
|
|
- const timeZoneOffset = moment.tz(`${moment().year()}-01-01`, timezone).format('Z')
|
|
|
|
|
|
|
+
|
|
|
|
|
+ const timeZoneOffset = moment.tz(time, timezone).format('Z')
|
|
|
// 替换 "+07:00" 为 "UTC+07"
|
|
// 替换 "+07:00" 为 "UTC+07"
|
|
|
utcOffset = `(UTC${timeZoneOffset.slice(0, 3)})`
|
|
utcOffset = `(UTC${timeZoneOffset.slice(0, 3)})`
|
|
|
return `${formattedTime} ${utcOffset}`
|
|
return `${formattedTime} ${utcOffset}`
|
|
@@ -30,9 +31,10 @@ export const formatTimezone = (time: string, timezone?: string) => {
|
|
|
* @param timezone
|
|
* @param timezone
|
|
|
* @returns
|
|
* @returns
|
|
|
*/
|
|
*/
|
|
|
-export const getTimezone = (timezone: string): string => {
|
|
|
|
|
|
|
+export const getTimezone = (timezone: string, time?: string): string => {
|
|
|
if (!timezone) return ''
|
|
if (!timezone) return ''
|
|
|
- const offset = moment.tz(`${moment().year()}-01-01`, timezone).format('Z')
|
|
|
|
|
|
|
+ const computedTime = time ? time : moment(time).format(formatString.value)
|
|
|
|
|
+ const offset = moment.tz(computedTime, timezone).format('Z')
|
|
|
return `UTC${offset.slice(0, 3)}`
|
|
return `UTC${offset.slice(0, 3)}`
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -42,7 +44,7 @@ export const formatTimezoneByUTCorGMT = (time: string, timezone: string) => {
|
|
|
formattedTime = moment(time).format(`${formatString.value} hh:mm A`)
|
|
formattedTime = moment(time).format(`${formatString.value} hh:mm A`)
|
|
|
let gmtOffset = ''
|
|
let gmtOffset = ''
|
|
|
if (timezone != null) {
|
|
if (timezone != null) {
|
|
|
- const timeZoneOffset = moment().tz(timezone).format('Z')
|
|
|
|
|
|
|
+ const timeZoneOffset = moment.tz(time, timezone).format('Z')
|
|
|
// 替换 "+07:00" 为 "GMT+07"
|
|
// 替换 "+07:00" 为 "GMT+07"
|
|
|
if (timezone.includes('Seoul')) {
|
|
if (timezone.includes('Seoul')) {
|
|
|
gmtOffset = `(UTC${timeZoneOffset.slice(0, 3)})`
|
|
gmtOffset = `(UTC${timeZoneOffset.slice(0, 3)})`
|