|
|
@@ -4,17 +4,17 @@ export const formatTimezone = (time: string, timezone: string) => {
|
|
|
if (!time) return '--'
|
|
|
let formattedTime = ''
|
|
|
if (time.length > 12) {
|
|
|
- formattedTime = moment(time).format('MMM-DD-YYYY hh:mm A')
|
|
|
+ formattedTime = moment(time).format(`${formatString} hh:mm A`)
|
|
|
if (!timezone) {
|
|
|
return formattedTime
|
|
|
}
|
|
|
let gmtOffset = ''
|
|
|
- const timeZoneOffset = moment().tz(timezone).format('Z')
|
|
|
+ const timeZoneOffset = moment.tz(`${moment().year()}-01-01`, timezone).format('Z')
|
|
|
// 替换 "+07:00" 为 "GMT+07"
|
|
|
gmtOffset = `(GMT${timeZoneOffset.slice(0, 3)})`
|
|
|
return `${formattedTime} ${gmtOffset}`
|
|
|
} else {
|
|
|
- formattedTime = moment(time).format('MMM-DD-YYYY')
|
|
|
+ formattedTime = moment(time).format(formatString)
|
|
|
return formattedTime
|
|
|
}
|
|
|
}
|
|
|
@@ -50,7 +50,7 @@ export const formatTimezoneByUser = (time: string, timezone?: string) => {
|
|
|
return formattedTime
|
|
|
}
|
|
|
let gmtOffset = ''
|
|
|
- const timeZoneOffset = moment().tz(timezone).format('Z')
|
|
|
+ const timeZoneOffset = moment.tz(`${moment().year()}-01-01`, timezone).format('Z')
|
|
|
// 替换 "+07:00" 为 "GMT+07"
|
|
|
gmtOffset = `(GMT${timeZoneOffset.slice(0, 3)})`
|
|
|
return `${formattedTime} ${gmtOffset}`
|