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!

moved iso-countries into a separate file

Blue Mouse8912bd341e45
diff --git a/src/pages/Project/View/InteractiveMap.jsx b/src/pages/Project/View/InteractiveMap.jsx
index 8b55bd945..fa868d550 100644
--- a/src/pages/Project/View/InteractiveMap.jsx
+++ b/src/pages/Project/View/InteractiveMap.jsx
@@ -3,27 +3,10 @@ import cx from 'clsx'
import _map from 'lodash/map'
import { useTranslation } from 'react-i18next'
import PropTypes from 'prop-types'
-import countries from 'i18n-iso-countries'
-import countriesEn from 'i18n-iso-countries/langs/en.json'
-import countriesDe from 'i18n-iso-countries/langs/de.json'
-import countriesEl from 'i18n-iso-countries/langs/el.json'
-import countriesHi from 'i18n-iso-countries/langs/hi.json'
-import countriesUk from 'i18n-iso-countries/langs/uk.json'
-import countriesZh from 'i18n-iso-countries/langs/zh.json'
-import countriesRu from 'i18n-iso-countries/langs/ru.json'
-import countriesSv from 'i18n-iso-countries/langs/sv.json'
+import countries from 'utils/isoCountries'
import countriesList from 'utils/countries'
-countries.registerLocale(countriesEn)
-countries.registerLocale(countriesDe)
-countries.registerLocale(countriesEl)
-countries.registerLocale(countriesRu)
-countries.registerLocale(countriesHi)
-countries.registerLocale(countriesUk)
-countries.registerLocale(countriesZh)
-countries.registerLocale(countriesSv)
-
const InteractiveMap = ({ data, onClickCountry, total }) => {
const { t, i18n: { language } } = useTranslation('common')
const [hoverShow, setHoverShow] = useState(false)
diff --git a/src/pages/Project/View/ViewProject.helpers.jsx b/src/pages/Project/View/ViewProject.helpers.jsx
index 7b7738ded..8e4b907e4 100644
--- a/src/pages/Project/View/ViewProject.helpers.jsx
+++ b/src/pages/Project/View/ViewProject.helpers.jsx
@@ -9,24 +9,7 @@ import _size from 'lodash/size'
import _round from 'lodash/round'
import JSZip from 'jszip'
-import countries from 'i18n-iso-countries'
-import countriesEn from 'i18n-iso-countries/langs/en.json'
-import countriesDe from 'i18n-iso-countries/langs/de.json'
-import countriesEl from 'i18n-iso-countries/langs/el.json'
-import countriesHi from 'i18n-iso-countries/langs/hi.json'
-import countriesUk from 'i18n-iso-countries/langs/uk.json'
-import countriesZh from 'i18n-iso-countries/langs/zh.json'
-import countriesRu from 'i18n-iso-countries/langs/ru.json'
-import countriesSv from 'i18n-iso-countries/langs/sv.json'
-
-countries.registerLocale(countriesEn)
-countries.registerLocale(countriesDe)
-countries.registerLocale(countriesEl)
-countries.registerLocale(countriesRu)
-countries.registerLocale(countriesHi)
-countries.registerLocale(countriesUk)
-countries.registerLocale(countriesZh)
-countries.registerLocale(countriesSv)
+import countries from 'utils/isoCountries'
const getExportFilename = (prefix) => {
// turn something like 2022-03-02T19:31:00.100Z into 2022-03-02
diff --git a/src/pages/Project/View/ViewProject.jsx b/src/pages/Project/View/ViewProject.jsx
index 45708def9..bb76e9c00 100644
--- a/src/pages/Project/View/ViewProject.jsx
+++ b/src/pages/Project/View/ViewProject.jsx
@@ -7,15 +7,6 @@ import domToImage from 'dom-to-image'
import { saveAs } from 'file-saver'
import bb, { area } from 'billboard.js'
import Flag from 'react-flagkit'
-import countries from 'i18n-iso-countries'
-import countriesEn from 'i18n-iso-countries/langs/en.json'
-import countriesDe from 'i18n-iso-countries/langs/de.json'
-import countriesEl from 'i18n-iso-countries/langs/el.json'
-import countriesHi from 'i18n-iso-countries/langs/hi.json'
-import countriesUk from 'i18n-iso-countries/langs/uk.json'
-import countriesZh from 'i18n-iso-countries/langs/zh.json'
-import countriesRu from 'i18n-iso-countries/langs/ru.json'
-import countriesSv from 'i18n-iso-countries/langs/sv.json'
import {
GlobeIcon, TranslateIcon, DocumentTextIcon, DeviceMobileIcon, ArrowCircleRightIcon, SearchIcon, ServerIcon, DownloadIcon,
} from '@heroicons/react/outline'
@@ -50,21 +41,13 @@ import routes from 'routes'
import {
getProjectData, getProject, getOverallStats, getLiveVisitors,
} from 'api'
+import countries from 'utils/isoCountries'
import {
Panel, Overview, CustomEvents,
} from './Panels'
import './styles.css'
import { onCSVExportClick } from './ViewProject.helpers'
-countries.registerLocale(countriesEn)
-countries.registerLocale(countriesDe)
-countries.registerLocale(countriesEl)
-countries.registerLocale(countriesRu)
-countries.registerLocale(countriesHi)
-countries.registerLocale(countriesUk)
-countries.registerLocale(countriesZh)
-countries.registerLocale(countriesSv)
-
const CCRow = memo(({ rowName, language }) => (
<>
<Flag
diff --git a/src/utils/isoCountries.js b/src/utils/isoCountries.js
new file mode 100644
index 000000000..15ec6a20f
--- /dev/null
+++ b/src/utils/isoCountries.js
@@ -0,0 +1,20 @@
+import countries from 'i18n-iso-countries'
+import countriesEn from 'i18n-iso-countries/langs/en.json'
+import countriesDe from 'i18n-iso-countries/langs/de.json'
+import countriesEl from 'i18n-iso-countries/langs/el.json'
+import countriesHi from 'i18n-iso-countries/langs/hi.json'
+import countriesUk from 'i18n-iso-countries/langs/uk.json'
+import countriesZh from 'i18n-iso-countries/langs/zh.json'
+import countriesRu from 'i18n-iso-countries/langs/ru.json'
+import countriesSv from 'i18n-iso-countries/langs/sv.json'
+
+countries.registerLocale(countriesEn)
+countries.registerLocale(countriesDe)
+countries.registerLocale(countriesEl)
+countries.registerLocale(countriesRu)
+countries.registerLocale(countriesHi)
+countries.registerLocale(countriesUk)
+countries.registerLocale(countriesZh)
+countries.registerLocale(countriesSv)
+
+export default countries