From e572b65e4ea8f8f3924b8fa0bd550610d94c437a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20=C3=85lund?= Date: Tue, 3 Mar 2020 21:06:58 +0100 Subject: [PATCH 1/3] Make timezone more global --- .../HomepageTimer/HomepageTimer.tsx | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/frontend/packages/plugins/home-page/src/components/HomepageTimer/HomepageTimer.tsx b/frontend/packages/plugins/home-page/src/components/HomepageTimer/HomepageTimer.tsx index ad6d81161c..2939a08db9 100644 --- a/frontend/packages/plugins/home-page/src/components/HomepageTimer/HomepageTimer.tsx +++ b/frontend/packages/plugins/home-page/src/components/HomepageTimer/HomepageTimer.tsx @@ -3,14 +3,14 @@ import { HeaderLabel } from '@spotify-backstage/core'; const timeFormat = { hour: '2-digit', minute: '2-digit' }; const nycOptions = { timeZone: 'America/New_York', ...timeFormat }; -const utcOptions = { timeZone: 'UTC', ...timeFormat }; -const lonOptions = { timeZone: 'Europe/London', ...timeFormat }; +const sydOptions = { timeZone: 'Australia/Sydney', ...timeFormat }; +const tyoOptions = { timeZone: 'Asia/Tokyo', ...timeFormat }; const stoOptions = { timeZone: 'Europe/Stockholm', ...timeFormat }; const defaultTimes = { timeNY: '', - timeUTC: '', - timeLON: '', + timeSYD: '', + timeTYO: '', timeSTO: '', }; @@ -21,15 +21,15 @@ function getTimes() { // Using the browser native toLocaleTimeString instead of huge moment-tz // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toLocaleTimeString const timeNY = d.toLocaleTimeString(lang, nycOptions); - const timeUTC = d.toLocaleTimeString(lang, utcOptions); - const timeLON = d.toLocaleTimeString(lang, lonOptions); + const timeSYD = d.toLocaleTimeString(lang, sydOptions); + const timeTYO = d.toLocaleTimeString(lang, tyoOptions); const timeSTO = d.toLocaleTimeString(lang, stoOptions); - return { timeNY, timeUTC, timeLON, timeSTO }; + return { timeNY, timeSYD, timeTYO, timeSTO }; } const HomePageTimer: FC<{}> = () => { - const [{ timeNY, timeUTC, timeLON, timeSTO }, setTimes] = React.useState( + const [{ timeNY, timeSYD, timeTYO, timeSTO }, setTimes] = React.useState( defaultTimes, ); @@ -48,9 +48,9 @@ const HomePageTimer: FC<{}> = () => { return ( <> - - + + ); }; From eadd0677733821b331b739ad8d24700bb0b60eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20=C3=85lund?= Date: Wed, 4 Mar 2020 12:47:09 +0100 Subject: [PATCH 2/3] Replace SYD with UTC --- .../src/components/HomepageTimer/HomepageTimer.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/packages/plugins/home-page/src/components/HomepageTimer/HomepageTimer.tsx b/frontend/packages/plugins/home-page/src/components/HomepageTimer/HomepageTimer.tsx index 2939a08db9..ec8c260c46 100644 --- a/frontend/packages/plugins/home-page/src/components/HomepageTimer/HomepageTimer.tsx +++ b/frontend/packages/plugins/home-page/src/components/HomepageTimer/HomepageTimer.tsx @@ -2,14 +2,14 @@ import React, { FC } from 'react'; import { HeaderLabel } from '@spotify-backstage/core'; const timeFormat = { hour: '2-digit', minute: '2-digit' }; +const utcOptions = { timeZone: 'UTC', ...timeFormat }; const nycOptions = { timeZone: 'America/New_York', ...timeFormat }; -const sydOptions = { timeZone: 'Australia/Sydney', ...timeFormat }; const tyoOptions = { timeZone: 'Asia/Tokyo', ...timeFormat }; const stoOptions = { timeZone: 'Europe/Stockholm', ...timeFormat }; const defaultTimes = { timeNY: '', - timeSYD: '', + timeUTC: '', timeTYO: '', timeSTO: '', }; @@ -29,7 +29,7 @@ function getTimes() { } const HomePageTimer: FC<{}> = () => { - const [{ timeNY, timeSYD, timeTYO, timeSTO }, setTimes] = React.useState( + const [{ timeNY, timeUTC, timeTYO, timeSTO }, setTimes] = React.useState( defaultTimes, ); @@ -48,9 +48,9 @@ const HomePageTimer: FC<{}> = () => { return ( <> + - ); }; From d357b086e1d7eab98fa7f339bedd0ba9582a242f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20=C3=85lund?= Date: Wed, 4 Mar 2020 12:47:59 +0100 Subject: [PATCH 3/3] Update HomepageTimer.tsx --- .../home-page/src/components/HomepageTimer/HomepageTimer.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/packages/plugins/home-page/src/components/HomepageTimer/HomepageTimer.tsx b/frontend/packages/plugins/home-page/src/components/HomepageTimer/HomepageTimer.tsx index ec8c260c46..cfe70975aa 100644 --- a/frontend/packages/plugins/home-page/src/components/HomepageTimer/HomepageTimer.tsx +++ b/frontend/packages/plugins/home-page/src/components/HomepageTimer/HomepageTimer.tsx @@ -21,11 +21,11 @@ function getTimes() { // Using the browser native toLocaleTimeString instead of huge moment-tz // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toLocaleTimeString const timeNY = d.toLocaleTimeString(lang, nycOptions); - const timeSYD = d.toLocaleTimeString(lang, sydOptions); + const timeUTC = d.toLocaleTimeString(lang, utcOptions); const timeTYO = d.toLocaleTimeString(lang, tyoOptions); const timeSTO = d.toLocaleTimeString(lang, stoOptions); - return { timeNY, timeSYD, timeTYO, timeSTO }; + return { timeNY, timeUTC, timeTYO, timeSTO }; } const HomePageTimer: FC<{}> = () => {