paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-12 18:06:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

timerender: Avoid another timeZoneName: "longOffset".

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2023-11-29 10:29:29 -08:00
committed by Tim Abbott
parent 311f72dd56
commit 9b03f0c1c8
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
web/src/timerender.ts
View File

@@ -12,7 +12,7 @@ import _ from "lodash";
import render_markdown_time_tooltip from "../templates/markdown_time_tooltip.hbs"; import render_markdown_time_tooltip from "../templates/markdown_time_tooltip.hbs";
import {$t} from "./i18n"; import {$t} from "./i18n";
import {difference_in_calendar_days, start_of_day} from "./time_zone_util"; import {difference_in_calendar_days, get_offset, start_of_day} from "./time_zone_util";
import {parse_html} from "./ui_util"; import {parse_html} from "./ui_util";
import {user_settings} from "./user_settings"; import {user_settings} from "./user_settings";
@@ -149,13 +149,10 @@ export function get_tz_with_UTC_offset(time: number | Date): string {
// show that along with (UTC+x:y) // show that along with (UTC+x:y)
timezone = /GMT[+-][\d:]*/.test(timezone ?? "") ? "" : timezone; timezone = /GMT[+-][\d:]*/.test(timezone ?? "") ? "" : timezone;
const tz_offset = new Intl.DateTimeFormat(user_settings.default_language, { const offset_minutes = Math.round(get_offset(time, display_time_zone) / 60000);
timeZone: display_time_zone, const tz_UTC_offset = `(UTC${offset_minutes < 0 ? "-" : "+"}${String(
timeZoneName: "longOffset", Math.floor(Math.abs(offset_minutes) / 60),
}) ).padStart(2, "0")}:${String(Math.abs(offset_minutes) % 60).padStart(2, "0")})`;
.formatToParts(time)
.find(({type}) => type === "timeZoneName")!.value;
const tz_UTC_offset = `(${tz_offset.replace(/^GMT/, "UTC")})`;
if (timezone) { if (timezone) {
return timezone + " " + tz_UTC_offset; return timezone + " " + tz_UTC_offset;