Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

fixed locale related potential crash

Blue Mousec7f8a84e3063
diff --git a/app/pages/Project/View/ViewProject.tsx b/app/pages/Project/View/ViewProject.tsx
index 7fd7e5032..585de5986 100644
--- a/app/pages/Project/View/ViewProject.tsx
+++ b/app/pages/Project/View/ViewProject.tsx
@@ -51,7 +51,7 @@ import { withProjectProtected } from 'hoc/projectProtected'
import { periodToCompareDate } from 'utils/compareConvertDate'
-import { getTimeFromSeconds, getStringFromTime, displayNamesPolyfill } from 'utils/generic'
+import { getTimeFromSeconds, getStringFromTime, getLocaleDisplayName } from 'utils/generic'
import { getItem, setItem, removeItem } from 'utils/localstorage'
import EventsRunningOutBanner from 'components/EventsRunningOutBanner'
import {
@@ -3614,10 +3614,6 @@ const ViewProject = ({
}
if (type === 'lc') {
- const languageNames = Intl.DisplayNames
- ? new Intl.DisplayNames([language], { type: 'language' })
- : displayNamesPolyfill
-
return (
<Panel
projectPassword={projectPassword}
@@ -3629,7 +3625,7 @@ const ViewProject = ({
onFilter={filterHandler}
name={panelName}
data={panelsData.data[type]}
- rowMapper={({ name: entryName }) => languageNames.of(entryName)}
+ rowMapper={({ name: entryName }) => getLocaleDisplayName(entryName, language)}
customTabs={customTabs}
/>
)
diff --git a/app/pages/Project/View/components/Filters.tsx b/app/pages/Project/View/components/Filters.tsx
index 37d684a63..8ff631f97 100644
--- a/app/pages/Project/View/components/Filters.tsx
+++ b/app/pages/Project/View/components/Filters.tsx
@@ -6,7 +6,7 @@ import PropTypes from 'prop-types'
import { useTranslation } from 'react-i18next'
import countries from 'utils/isoCountries'
-import { displayNamesPolyfill } from 'utils/generic'
+import { getLocaleDisplayName } from 'utils/generic'
interface IFilter {
column: string
@@ -51,11 +51,7 @@ export const Filter = ({
}
if (column === 'lc') {
- const languageNames = Intl.DisplayNames
- ? new Intl.DisplayNames([language], { type: 'language' })
- : displayNamesPolyfill
-
- displayFilter = languageNames.of(filter) || filter
+ displayFilter = getLocaleDisplayName(displayFilter, language)
}
const truncatedFilter = _truncate(displayFilter)
diff --git a/app/pages/Project/View/components/SessionDetails.tsx b/app/pages/Project/View/components/SessionDetails.tsx
index f6b97e410..f7333684a 100644
--- a/app/pages/Project/View/components/SessionDetails.tsx
+++ b/app/pages/Project/View/components/SessionDetails.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next'
import _capitalize from 'lodash/capitalize'
import _size from 'lodash/size'
import _truncate from 'lodash/truncate'
-import { displayNamesPolyfill, getStringFromTime, getTimeFromSeconds } from 'utils/generic'
+import { getLocaleDisplayName, getStringFromTime, getTimeFromSeconds } from 'utils/generic'
import { ISessionDetails } from '../interfaces/session'
import { MetricCard, MetricCardSelect } from './MetricCards'
import CCRow from './CCRow'
@@ -81,12 +81,11 @@ export const SessionDetails = ({ details, psid }: ISessionDetailsComponent) => {
label={t('project.mapping.lc')}
value={details.lc || 'N/A'}
valueMapper={(value) => {
- const languageNames =
- Intl.DisplayNames && language !== 'N/A'
- ? new Intl.DisplayNames([language], { type: 'language' })
- : displayNamesPolyfill
+ if (value === 'N/A') {
+ return value
+ }
- return languageNames.of(value)
+ return getLocaleDisplayName(value, language)
}}
/>
<MetricCard
diff --git a/app/utils/generic.ts b/app/utils/generic.ts
index c373a7251..0d42e5d15 100644
--- a/app/utils/generic.ts
+++ b/app/utils/generic.ts
@@ -124,3 +124,15 @@ export const calculateRelativePercentage = (oldVal: number, newVal: number, roun
export const displayNamesPolyfill = {
of: (name: string) => name,
}
+
+export const getLocaleDisplayName = (locale: string, language: string): string => {
+ const languageNames = Intl.DisplayNames
+ ? new Intl.DisplayNames([language], { type: 'language' })
+ : displayNamesPolyfill
+
+ try {
+ return languageNames.of(locale) || locale
+ } catch (reason) {
+ return locale
+ }
+}