From 454da735a56803c4d50eb09f840f801205bb7934 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= Date: Tue, 21 Dec 2021 03:46:52 +0000 Subject: [PATCH] feat: add timezone abbreviations --- .../SystemPerformance/SystemPerformance.js | 6 +- new-lamassu-admin/src/utils/timezone-list.js | 168 ++++++++++-------- 2 files changed, 99 insertions(+), 75 deletions(-) diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.js b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.js index 341f3385..29b3dca1 100644 --- a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.js +++ b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.js @@ -15,6 +15,7 @@ import { ReactComponent as PercentNeutralIcon } from 'src/styling/icons/dashboar import { ReactComponent as PercentUpIcon } from 'src/styling/icons/dashboard/up.svg' import { java, neon } from 'src/styling/variables' import { fromNamespace } from 'src/utils/config' +import { timezones } from 'src/utils/timezone-list' import { toTimezone } from 'src/utils/timezones' import PercentageChart from './Graphs/PercentageChart' @@ -205,7 +206,10 @@ const SystemPerformance = () => {
Transactions
-

{timezone} timezone

+

+ {timezones[timezone].short ?? timezones[timezone].long}{' '} + timezone +

diff --git a/new-lamassu-admin/src/utils/timezone-list.js b/new-lamassu-admin/src/utils/timezone-list.js index c2d681cd..8683cfcd 100644 --- a/new-lamassu-admin/src/utils/timezone-list.js +++ b/new-lamassu-admin/src/utils/timezone-list.js @@ -6,86 +6,106 @@ const timezones = { 'Pacific/Midway': { short: 'SST', long: 'Midway Island, Samoa' }, 'Pacific/Honolulu': { short: 'HAST', long: 'Hawaii' }, 'America/Juneau': { short: 'AKST', long: 'Alaska' }, - 'America/Boise': { long: 'Mountain Time' }, - 'America/Dawson': { long: 'Dawson, Yukon' }, - 'America/Chihuahua': { long: 'Chihuahua, La Paz, Mazatlan' }, - 'America/Phoenix': { long: 'Arizona' }, - 'America/Chicago': { long: 'Central Time' }, - 'America/Regina': { long: 'Saskatchewan' }, - 'America/Mexico_City': { long: 'Guadalajara, Mexico City, Monterrey' }, - 'America/Belize': { long: 'Central America' }, - 'America/Detroit': { long: 'Eastern Time' }, - 'America/Bogota': { long: 'Bogota, Lima, Quito' }, - 'America/Caracas': { long: 'Caracas, La Paz' }, - 'America/Santiago': { long: 'Santiago' }, - 'America/St_Johns': { long: 'Newfoundland and Labrador' }, - 'America/Sao_Paulo': { long: 'Brasilia' }, - 'America/Tijuana': { long: 'Tijuana' }, - 'America/Montevideo': { long: 'Montevideo' }, - 'America/Argentina/Buenos_Aires': { long: 'Buenos Aires, Georgetown' }, - 'America/Godthab': { long: 'Greenland' }, - 'America/Los_Angeles': { long: 'Pacific Time' }, - 'Atlantic/Azores': { long: 'Azores' }, - 'Atlantic/Cape_Verde': { long: 'Cape Verde Islands' }, - GMT: { long: 'UTC' }, - 'Europe/London': { long: 'Edinburgh, London' }, - 'Europe/Dublin': { long: 'Dublin' }, - 'Europe/Lisbon': { long: 'Lisbon' }, - 'Africa/Casablanca': { long: 'Casablanca, Monrovia' }, - 'Atlantic/Canary': { long: 'Canary Islands' }, + 'America/Boise': { short: 'MST', long: 'Mountain Time' }, + 'America/Dawson': { short: 'MST', long: 'Dawson, Yukon' }, + 'America/Chihuahua': { short: null, long: 'Chihuahua, La Paz, Mazatlan' }, + 'America/Phoenix': { short: 'MST', long: 'Arizona' }, + 'America/Chicago': { short: 'CST', long: 'Central Time' }, + 'America/Regina': { short: 'CST', long: 'Saskatchewan' }, + 'America/Mexico_City': { + short: 'CST', + long: 'Guadalajara, Mexico City, Monterrey' + }, + 'America/Belize': { short: 'CST', long: 'Central America' }, + 'America/Detroit': { short: 'EST', long: 'Eastern Time' }, + 'America/Bogota': { short: 'COT', long: 'Bogota, Lima, Quito' }, + 'America/Caracas': { short: 'VET', long: 'Caracas, La Paz' }, + 'America/Santiago': { short: 'CLST', long: 'Santiago' }, + 'America/St_Johns': { short: 'HNTN', long: 'Newfoundland and Labrador' }, + 'America/Sao_Paulo': { short: 'BRT', long: 'Brasilia' }, + 'America/Tijuana': { short: 'PST', long: 'Tijuana' }, + 'America/Montevideo': { short: 'UYT', long: 'Montevideo' }, + 'America/Argentina/Buenos_Aires': { + short: null, + long: 'Buenos Aires, Georgetown' + }, + 'America/Godthab': { short: null, long: 'Greenland' }, + 'America/Los_Angeles': { short: 'PST', long: 'Pacific Time' }, + 'Atlantic/Azores': { short: 'AZOT', long: 'Azores' }, + 'Atlantic/Cape_Verde': { short: 'CVT', long: 'Cape Verde Islands' }, + GMT: { short: 'GMT', long: 'UTC' }, + 'Europe/London': { short: 'GMT', long: 'Edinburgh, London' }, + 'Europe/Dublin': { short: 'GMT', long: 'Dublin' }, + 'Europe/Lisbon': { short: 'WET', long: 'Lisbon' }, + 'Africa/Casablanca': { short: 'WET', long: 'Casablanca, Monrovia' }, + 'Atlantic/Canary': { short: 'WET', long: 'Canary Islands' }, 'Europe/Belgrade': { + short: 'CET', long: 'Belgrade, Bratislava, Budapest, Ljubljana, Prague' }, - 'Europe/Sarajevo': { long: 'Sarajevo, Skopje, Warsaw, Zagreb' }, - 'Europe/Brussels': { long: 'Brussels, Copenhagen, Madrid, Paris' }, + 'Europe/Sarajevo': { short: 'CET', long: 'Sarajevo, Skopje, Warsaw, Zagreb' }, + 'Europe/Brussels': { + short: 'CET', + long: 'Brussels, Copenhagen, Madrid, Paris' + }, 'Europe/Amsterdam': { + short: 'CET', long: 'Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna' }, - 'Africa/Algiers': { long: 'West Central Africa' }, - 'Europe/Bucharest': { long: 'Bucharest' }, - 'Africa/Cairo': { long: 'Cairo' }, - 'Europe/Helsinki': { long: 'Helsinki, Kiev, Riga, Sofia, Tallinn, Vilnius' }, - 'Europe/Athens': { long: 'Athens, Istanbul, Minsk' }, - 'Asia/Jerusalem': { long: 'Jerusalem' }, - 'Africa/Harare': { long: 'Harare, Pretoria' }, - 'Europe/Moscow': { long: 'Moscow, St. Petersburg, Volgograd' }, - 'Asia/Kuwait': { long: 'Kuwait, Riyadh' }, - 'Africa/Nairobi': { long: 'Nairobi' }, - 'Asia/Baghdad': { long: 'Baghdad' }, - 'Asia/Tehran': { long: 'Tehran' }, - 'Asia/Dubai': { long: 'Abu Dhabi, Muscat' }, - 'Asia/Baku': { long: 'Baku, Tbilisi, Yerevan' }, - 'Asia/Kabul': { long: 'Kabul' }, - 'Asia/Yekaterinburg': { long: 'Ekaterinburg' }, - 'Asia/Karachi': { long: 'Islamabad, Karachi, Tashkent' }, - 'Asia/Kolkata': { long: 'Chennai, Kolkata, Mumbai, New Delhi' }, - 'Asia/Kathmandu': { long: 'Kathmandu' }, - 'Asia/Dhaka': { long: 'Astana, Dhaka' }, - 'Asia/Colombo': { long: 'Sri Jayawardenepura' }, - 'Asia/Almaty': { long: 'Almaty, Novosibirsk' }, - 'Asia/Rangoon': { long: 'Yangon Rangoon' }, - 'Asia/Bangkok': { long: 'Bangkok, Hanoi, Jakarta' }, - 'Asia/Krasnoyarsk': { long: 'Krasnoyarsk' }, - 'Asia/Shanghai': { long: 'Beijing, Chongqing, Hong Kong SAR, Urumqi' }, - 'Asia/Kuala_Lumpur': { long: 'Kuala Lumpur, Singapore' }, - 'Asia/Taipei': { long: 'Taipei' }, - 'Australia/Perth': { long: 'Perth' }, - 'Asia/Irkutsk': { long: 'Irkutsk, Ulaanbaatar' }, - 'Asia/Seoul': { long: 'Seoul' }, - 'Asia/Tokyo': { long: 'Osaka, Sapporo, Tokyo' }, - 'Asia/Yakutsk': { long: 'Yakutsk' }, - 'Australia/Darwin': { long: 'Darwin' }, - 'Australia/Adelaide': { long: 'Adelaide' }, - 'Australia/Sydney': { long: 'Canberra, Melbourne, Sydney' }, - 'Australia/Brisbane': { long: 'Brisbane' }, - 'Australia/Hobart': { long: 'Hobart' }, - 'Asia/Vladivostok': { long: 'Vladivostok' }, - 'Pacific/Guam': { long: 'Guam, Port Moresby' }, - 'Asia/Magadan': { long: 'Magadan, Solomon Islands, New Caledonia' }, - 'Asia/Kamchatka': { long: 'Kamchatka, Marshall Islands' }, - 'Pacific/Fiji': { long: 'Fiji Islands' }, - 'Pacific/Auckland': { long: 'Auckland, Wellington' }, - 'Pacific/Tongatapu': { long: "Nuku'alofa" } + 'Africa/Algiers': { short: 'CET', long: 'West Central Africa' }, + 'Europe/Bucharest': { short: 'EET', long: 'Bucharest' }, + 'Africa/Cairo': { short: 'EET', long: 'Cairo' }, + 'Europe/Helsinki': { + short: 'EET', + long: 'Helsinki, Kiev, Riga, Sofia, Tallinn, Vilnius' + }, + 'Europe/Athens': { short: 'EET', long: 'Athens, Istanbul, Minsk' }, + 'Asia/Jerusalem': { short: 'IST', long: 'Jerusalem' }, + 'Africa/Harare': { short: 'CAT', long: 'Harare, Pretoria' }, + 'Europe/Moscow': { short: 'MSK', long: 'Moscow, St. Petersburg, Volgograd' }, + 'Asia/Kuwait': { short: 'AST', long: 'Kuwait, Riyadh' }, + 'Africa/Nairobi': { short: 'EAT', long: 'Nairobi' }, + 'Asia/Baghdad': { short: 'AST', long: 'Baghdad' }, + 'Asia/Tehran': { short: 'IRST', long: 'Tehran' }, + 'Asia/Dubai': { short: 'GST', long: 'Abu Dhabi, Muscat' }, + 'Asia/Baku': { short: 'AZT', long: 'Baku, Tbilisi, Yerevan' }, + 'Asia/Kabul': { short: 'AFT', long: 'Kabul' }, + 'Asia/Yekaterinburg': { short: 'YEKT', long: 'Ekaterinburg' }, + 'Asia/Karachi': { short: 'PKT', long: 'Islamabad, Karachi, Tashkent' }, + 'Asia/Kolkata': { short: 'IST', long: 'Chennai, Kolkata, Mumbai, New Delhi' }, + 'Asia/Kathmandu': { short: null, long: 'Kathmandu' }, + 'Asia/Dhaka': { short: 'BST', long: 'Astana, Dhaka' }, + 'Asia/Colombo': { short: 'IST', long: 'Sri Jayawardenepura' }, + 'Asia/Almaty': { short: 'ALMT', long: 'Almaty, Novosibirsk' }, + 'Asia/Rangoon': { short: null, long: 'Yangon Rangoon' }, + 'Asia/Bangkok': { short: 'ICT', long: 'Bangkok, Hanoi, Jakarta' }, + 'Asia/Krasnoyarsk': { short: 'KRAT', long: 'Krasnoyarsk' }, + 'Asia/Shanghai': { + short: 'CST', + long: 'Beijing, Chongqing, Hong Kong SAR, Urumqi' + }, + 'Asia/Kuala_Lumpur': { short: 'MYT', long: 'Kuala Lumpur, Singapore' }, + 'Asia/Taipei': { short: 'CST', long: 'Taipei' }, + 'Australia/Perth': { short: 'AWST', long: 'Perth' }, + 'Asia/Irkutsk': { short: 'IRKT', long: 'Irkutsk, Ulaanbaatar' }, + 'Asia/Seoul': { short: 'KST', long: 'Seoul' }, + 'Asia/Tokyo': { short: 'JST', long: 'Osaka, Sapporo, Tokyo' }, + 'Asia/Yakutsk': { short: 'YAKT', long: 'Yakutsk' }, + 'Australia/Darwin': { short: 'ACST', long: 'Darwin' }, + 'Australia/Adelaide': { short: 'ACDT', long: 'Adelaide' }, + 'Australia/Sydney': { short: 'AEDT', long: 'Canberra, Melbourne, Sydney' }, + 'Australia/Brisbane': { short: 'AEST', long: 'Brisbane' }, + 'Australia/Hobart': { short: 'AEDT', long: 'Hobart' }, + 'Asia/Vladivostok': { short: 'VLAT', long: 'Vladivostok' }, + 'Pacific/Guam': { short: 'ChST', long: 'Guam, Port Moresby' }, + 'Asia/Magadan': { + short: 'MAGT', + long: 'Magadan, Solomon Islands, New Caledonia' + }, + 'Asia/Kamchatka': { short: 'PETT', long: 'Kamchatka, Marshall Islands' }, + 'Pacific/Fiji': { short: 'FJT', long: 'Fiji Islands' }, + 'Pacific/Auckland': { short: 'NZDT', long: 'Auckland, Wellington' }, + 'Pacific/Tongatapu': { short: null, long: "Nuku'alofa" } } const buildTzLabels = timezoneList => {