Merge branch 'dev' of https://github.com/mikecao/umami into dev

components/metrics/LanguagesTable.js

@@ -0,0 +1,31 @@
+import React from 'react';
+import MetricsTable from './MetricsTable';
+import { percentFilter } from 'lib/filters';
+import { FormattedMessage } from 'react-intl';
+import useLanguageNames from 'hooks/useLanguageNames';
+import useLocale from 'hooks/useLocale';
+
+export default function LanguagesTable({ websiteId, onDataLoad, ...props }) {
+  const { locale } = useLocale();
+  const languageNames = useLanguageNames(locale);
+
+  function renderLabel({ x }) {
+    return (
+      <div className={locale}>
+        {languageNames[x] ?? <FormattedMessage id="label.unknown" defaultMessage="Unknown" />}{' '}
+      </div>
+    );
+  }
+
+  return (
+    <MetricsTable
+      {...props}
+      title={<FormattedMessage id="metrics.languages" defaultMessage="Languages" />}
+      type="language"
+      metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
+      websiteId={websiteId}
+      onDataLoad={data => onDataLoad?.(percentFilter(data))}
+      renderLabel={renderLabel}
+    />
+  );
+}

components/pages/WebsiteDetails.js

@@ -16,6 +16,7 @@ import BrowsersTable from '../metrics/BrowsersTable';
 import OSTable from '../metrics/OSTable';
 import DevicesTable from '../metrics/DevicesTable';
 import CountriesTable from '../metrics/CountriesTable';
+import LanguagesTable from '../metrics/LanguagesTable';
 import EventsTable from '../metrics/EventsTable';
 import EventsChart from '../metrics/EventsChart';
 import useFetch from 'hooks/useFetch';
@@ -30,6 +31,7 @@ const views = {
   os: OSTable,
   device: DevicesTable,
   country: CountriesTable,
+  language: LanguagesTable,
   event: EventsTable,
 };
 
@@ -82,6 +84,10 @@ export default function WebsiteDetails({ websiteId }) {
       label: <FormattedMessage id="metrics.countries" defaultMessage="Countries" />,
       value: resolve({ view: 'country' }),
     },
+    {
+      label: <FormattedMessage id="metrics.languages" defaultMessage="Languages" />,
+      value: resolve({ view: 'language' }),
+    },
     {
       label: <FormattedMessage id="metrics.events" defaultMessage="Events" />,
       value: resolve({ view: 'event' }),