Added country to regions display.

umami-software · Apr 21, 2023 · e6c5a9b · e6c5a9b
1 parent 69b9458
commit e6c5a9b
Show file tree

Hide file tree

Showing 2 changed files with 3,625 additions and 3,552 deletions.
diff --git a/components/metrics/RegionsTable.js b/components/metrics/RegionsTable.js
@@ -3,19 +3,25 @@ import { emptyFilter } from 'lib/filters';
 import FilterLink from 'components/common/FilterLink';
 import useLocale from 'hooks/useLocale';
 import useMessages from 'hooks/useMessages';
+import useCountryNames from 'hooks/useCountryNames';
 import regions from 'public/iso-3166-2.json';
 
 export function RegionsTable({ websiteId, ...props }) {
   const { locale } = useLocale();
   const { formatMessage, labels } = useMessages();
+  const countryNames = useCountryNames(locale);
 
-  function renderLink({ x }) {
+  const renderLabel = x => {
+    return regions[x] ? `${regions[x]}, ${countryNames[x.split('-')[0]]}` : x;
+  };
+
+  const renderLink = ({ x }) => {
     return (
       <div className={locale}>
-        <FilterLink id="region" value={x} label={regions[x] || x} />
+        <FilterLink id="region" value={x} label={renderLabel(x)} />
       </div>
     );
-  }
+  };
 
   return (
     <MetricsTable