From 8c8ccc8b91e6746005531416b5b05f635241c041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Friedrich=20M=C3=A4ckle?= Date: Thu, 2 Sep 2021 12:47:25 +0200 Subject: [PATCH] Check navigator property exists before accessing it (#38745) * Check navigator property exists before acecssing it * fix: pass undefined to Intl.DateTimeFormat if no locale can be determined * Update packages/grafana-data/src/datetime/formats.ts replacing ternary by or Co-authored-by: Ashley Harrison Co-authored-by: Ashley Harrison --- packages/grafana-data/src/datetime/formats.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/grafana-data/src/datetime/formats.ts b/packages/grafana-data/src/datetime/formats.ts index cb26ee32716..df3711aabd0 100644 --- a/packages/grafana-data/src/datetime/formats.ts +++ b/packages/grafana-data/src/datetime/formats.ts @@ -92,12 +92,12 @@ export function localTimeFormat( return fallback ?? DEFAULT_SYSTEM_DATE_FORMAT; } - if (!locale) { + if (!locale && navigator) { locale = [...navigator.languages]; } // https://momentjs.com/docs/#/displaying/format/ - const dateTimeFormat = new Intl.DateTimeFormat(locale, options); + const dateTimeFormat = new Intl.DateTimeFormat(locale || undefined, options); const parts = dateTimeFormat.formatToParts(new Date()); const hour12 = dateTimeFormat.resolvedOptions().hour12;