chore: fix i18n imports and usage

src/components/AboutAOUnit/AboutAOUnit.js

@@ -3,7 +3,6 @@ import {
     useDataMutation,
     useTimeZoneConversion,
 } from '@dhis2/app-runtime'
-import i18n from '@dhis2/d2-i18n'
 import {
     Button,
     CircularLoader,
@@ -27,6 +26,7 @@ import React, {
     forwardRef,
     useImperativeHandle,
 } from 'react'
+import i18n from '../../locales/index.js'
 import { formatList } from '../../modules/list.js'
 import { RichTextParser } from '../RichText/index.js'
 import styles from './styles/AboutAOUnit.style.js'

src/components/AboutAOUnit/utils.js

@@ -1,4 +1,4 @@
-import i18n from '@dhis2/d2-i18n'
+import i18n from '../../locales/index.js'
 
 export const AO_TYPE_VISUALIZATION = 'visualization'
 export const AO_TYPE_MAP = 'map'

src/components/CachedDataQueryProvider.js

@@ -1,8 +1,8 @@
 import { useDataQuery } from '@dhis2/app-runtime'
-import i18n from '@dhis2/d2-i18n'
 import { Layer, CenteredContent, CircularLoader, NoticeBox } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React, { createContext, useContext } from 'react'
+import i18n from '../locales/index.js'
 
 const CachedDataQueryCtx = createContext({})
 

src/components/FileMenu/utils.js

@@ -1,4 +1,4 @@
-import i18n from '@dhis2/d2-i18n'
+import i18n from '../../locales/index.js'
 
 export const FILE_TYPE_EVENT_REPORT = 'eventReport'
 export const FILE_TYPE_VISUALIZATION = 'visualization'

src/components/Interpretations/InterpretationModal/Comment.js

@@ -1,7 +1,7 @@
-import i18n from '@dhis2/d2-i18n'
 import { IconEdit16 } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React, { useState } from 'react'
+import i18n from '../../../locales/index.js'
 import {
     Message,
     MessageIconButton,

src/components/Interpretations/InterpretationModal/CommentAddForm.js

@@ -1,8 +1,8 @@
 import { useDataMutation } from '@dhis2/app-runtime'
-import i18n from '@dhis2/d2-i18n'
 import { Button } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React, { useRef, useState } from 'react'
+import i18n from '../../../locales/index.js'
 import { RichTextEditor } from '../../RichText/index.js'
 import {
     MessageEditorContainer,

src/components/Interpretations/InterpretationModal/CommentDeleteButton.js

@@ -1,8 +1,8 @@
 import { useDataMutation } from '@dhis2/app-runtime'
-import i18n from '@dhis2/d2-i18n'
 import { IconDelete16, colors } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React, { useState } from 'react'
+import i18n from '../../../locales/index.js'
 import { MessageIconButton } from '../common/index.js'
 
 const mutation = {

src/components/Interpretations/InterpretationModal/CommentUpdateForm.js

@@ -1,8 +1,8 @@
 import { useDataMutation } from '@dhis2/app-runtime'
-import i18n from '@dhis2/d2-i18n'
 import { Button, spacers, colors } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React, { useState, useRef } from 'react'
+import i18n from '../../../locales/index.js'
 import { RichTextEditor } from '../../RichText/index.js'
 import { MessageEditorContainer, MessageButtonStrip } from '../common/index.js'
 

src/components/Interpretations/InterpretationModal/InterpretationModal.js

@@ -1,5 +1,4 @@
 import { useDataQuery } from '@dhis2/app-runtime'
-import i18n from '@dhis2/d2-i18n'
 import {
     Modal,
     ModalActions,
@@ -16,6 +15,7 @@ import cx from 'classnames'
 import PropTypes from 'prop-types'
 import React, { useEffect, useState, useMemo } from 'react'
 import css from 'styled-jsx/css'
+import i18n from '../../../locales/index.js'
 import { InterpretationThread } from './InterpretationThread.js'
 import { useModalContentWidth } from './useModalContentWidth.js'
 

src/components/Interpretations/InterpretationsUnit/InterpretationForm.js

@@ -1,8 +1,8 @@
 import { useDataMutation } from '@dhis2/app-runtime'
-import i18n from '@dhis2/d2-i18n'
 import { Button, Input } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React, { useRef, useState } from 'react'
+import i18n from '../../../locales/index.js'
 import { RichTextEditor } from '../../RichText/index.js'
 import { MessageEditorContainer, MessageButtonStrip } from '../common/index.js'
 

src/components/Interpretations/InterpretationsUnit/InterpretationsUnit.js

@@ -1,5 +1,4 @@
 import { useDataQuery } from '@dhis2/app-runtime'
-import i18n from '@dhis2/d2-i18n'
 import {
     CircularLoader,
     IconChevronDown24,
@@ -16,6 +15,7 @@ import React, {
     useImperativeHandle,
     forwardRef,
 } from 'react'
+import i18n from '../../../locales/index.js'
 import { InterpretationForm } from './InterpretationForm.js'
 import { InterpretationList } from './InterpretationList.js'
 

src/components/Interpretations/common/Interpretation/Interpretation.js

@@ -1,4 +1,3 @@
-import i18n from '@dhis2/d2-i18n'
 import {
     Button,
     SharingDialog,
@@ -11,6 +10,7 @@ import {
 } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React, { useState } from 'react'
+import i18n from '../../../../locales/index.js'
 import {
     Message,
     MessageStatsBar,

src/components/Interpretations/common/Interpretation/InterpretationDeleteButton.js

@@ -1,8 +1,8 @@
 import { useDataMutation } from '@dhis2/app-runtime'
-import i18n from '@dhis2/d2-i18n'
 import { IconDelete16 } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React from 'react'
+import i18n from '../../../../locales/index.js'
 import { MessageIconButton } from '../index.js'
 
 const mutation = {

src/components/Interpretations/common/Interpretation/InterpretationSharingLink.js

@@ -1,7 +1,7 @@
-import i18n from '@dhis2/d2-i18n'
 import { SharingDialog, colors, spacers } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React, { useState } from 'react'
+import i18n from '../../../../locales/index.js'
 
 const InterpretationSharingLink = ({ type, id }) => {
     const [showSharingDialog, setShowSharingDialog] = useState(false)

src/components/Interpretations/common/Interpretation/InterpretationUpdateForm.js

@@ -1,8 +1,8 @@
 import { useDataMutation } from '@dhis2/app-runtime'
-import i18n from '@dhis2/d2-i18n'
 import { Button, spacers, colors } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React, { useState } from 'react'
+import i18n from '../../../../locales/index.js'
 import { RichTextEditor } from '../../../RichText/index.js'
 import {
     MessageEditorContainer,

src/components/OfflineTooltip.js

@@ -1,9 +1,9 @@
 import { useDhis2ConnectionStatus } from '@dhis2/app-runtime'
-import i18n from '@dhis2/d2-i18n'
 import { Tooltip } from '@dhis2/ui'
 import cx from 'classnames'
 import PropTypes from 'prop-types'
 import React from 'react'
+import i18n from '../locales/index.js'
 import { styles } from './styles/OfflineTooltip.style.js'
 
 const OfflineTooltip = ({

src/components/OpenFileDialog/CreatedByFilter.js

@@ -1,7 +1,7 @@
-import i18n from '@dhis2/d2-i18n'
 import { SingleSelect, SingleSelectOption } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React from 'react'
+import i18n from '../../locales/index.js'
 
 // TODO change the "Created by" prefix to "Creator" or something that does not require a context for the translators
 

src/components/OpenFileDialog/CustomSelectOption.js

@@ -1,8 +1,8 @@
-import i18n from '@dhis2/d2-i18n'
 import { MenuDivider, Tooltip } from '@dhis2/ui'
 import cx from 'classnames'
 import PropTypes from 'prop-types'
 import React from 'react'
+import i18n from '../../locales/index.js'
 import styles from './styles/CustomSelectOption.style.js'
 
 const CustomSelectOptionItem = ({

src/components/OpenFileDialog/NameFilter.js

@@ -1,7 +1,7 @@
-import i18n from '@dhis2/d2-i18n'
 import { Input } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React from 'react'
+import i18n from '../../locales/index.js'
 
 export const NameFilter = ({ dataTest, value, onChange }) => (
     <Input

src/components/OpenFileDialog/OpenFileDialog.js

@@ -1,5 +1,4 @@
 import { useDataQuery } from '@dhis2/app-runtime'
-import i18n from '@dhis2/d2-i18n'
 import {
     Box,
     Modal,
@@ -24,6 +23,7 @@ import React, {
     useReducer,
     useState,
 } from 'react'
+import i18n from '../../locales/index.js'
 import {
     VIS_TYPE_GROUP_ALL,
     VIS_TYPE_GROUP_CHARTS,

src/components/OpenFileDialog/PaginationControls.js

@@ -1,7 +1,7 @@
-import i18n from '@dhis2/d2-i18n'
 import { Pagination } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React from 'react'
+import i18n from '../../locales/index.js'
 
 export const PaginationControls = ({ page, pager, onPageChange }) => (
     <Pagination

src/components/OpenFileDialog/VisTypeFilter.js

@@ -1,7 +1,7 @@
-import i18n from '@dhis2/d2-i18n'
 import { SingleSelect, colors } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React from 'react'
+import i18n from '../../locales/index.js'
 import {
     getDisplayNameByVisType,
     visTypeIcons,

src/components/OpenFileDialog/utils.js

@@ -1,4 +1,4 @@
-import i18n from '@dhis2/d2-i18n'
+import i18n from '../../locales/index.js'
 
 export const AO_TYPE_VISUALIZATION = 'visualization'
 export const AO_TYPE_MAP = 'map'
@@ -18,65 +18,66 @@ export const AOTypeMap = {
 
 const NO_TYPE = 'NO_TYPE'
 
-const texts = {
-    [NO_TYPE]: {
-        modalTitle: i18n.t('Open'),
-        loadingText: i18n.t('Loading'),
-        errorTitle: i18n.t("Couldn't load items"),
-        errorText: i18n.t(
-            'There was a problem loading items. Try again or contact your system administrator.'
-        ),
-        noDataText: i18n.t('No items found. Create a new to get started.'),
-        noFilteredDataText: i18n.t(
-            "No items found. Try adjusting your search or filter options to find what you're looking for."
-        ),
-        newButtonLabel: i18n.t('Create new'),
-    },
+export const getTranslatedString = (type, key) => {
+    const texts = {
+        [NO_TYPE]: {
+            modalTitle: i18n.t('Open'),
+            loadingText: i18n.t('Loading'),
+            errorTitle: i18n.t("Couldn't load items"),
+            errorText: i18n.t(
+                'There was a problem loading items. Try again or contact your system administrator.'
+            ),
+            noDataText: i18n.t('No items found. Create a new to get started.'),
+            noFilteredDataText: i18n.t(
+                "No items found. Try adjusting your search or filter options to find what you're looking for."
+            ),
+            newButtonLabel: i18n.t('Create new'),
+        },
 
-    [AO_TYPE_VISUALIZATION]: {
-        modalTitle: i18n.t('Open a visualization'),
-        loadingText: i18n.t('Loading visualizations'),
-        errorTitle: i18n.t("Couldn't load visualizations"),
-        errorText: i18n.t(
-            'There was a problem loading visualizations. Try again or contact your system administrator.'
-        ),
-        noDataText: i18n.t(
-            'No visualizations found. Click New visualization to get started.'
-        ),
-        noFilteredDataText: i18n.t(
-            "No visualizations found. Try adjusting your search or filter options to find what you're looking for."
-        ),
-        newButtonLabel: i18n.t('New visualization'),
-    },
-    [AO_TYPE_MAP]: {
-        modalTitle: i18n.t('Open a map'),
-        loadingText: i18n.t('Loading maps'),
-        errorTitle: i18n.t("Couldn't load maps"),
-        errorText: i18n.t(
-            'There was a problem loading maps. Try again or contact your system administrator.'
-        ),
-        noDataText: i18n.t('No maps found. Click New map to get started.'),
-        noFilteredDataText: i18n.t(
-            "No maps found. Try adjusting your search or filter options to find what you're looking for."
-        ),
-        newButtonLabel: i18n.t('New map'),
-    },
-    [AO_TYPE_EVENT_VISUALIZATION]: {
-        modalTitle: i18n.t('Open a line list'),
-        loadingText: i18n.t('Loading line lists'),
-        errorTitle: i18n.t("Couldn't load line lists"),
-        errorText: i18n.t(
-            'There was a problem loading line lists. Try again or contact your system administrator.'
-        ),
-        noDataText: i18n.t(
-            'No line lists found. Click New line list to get started.'
-        ),
-        noFilteredDataText: i18n.t(
-            "No line lists found. Try adjusting your search or filter options to find what you're looking for."
-        ),
-        newButtonLabel: i18n.t('New line list'),
-    },
-}
+        [AO_TYPE_VISUALIZATION]: {
+            modalTitle: i18n.t('Open a visualization'),
+            loadingText: i18n.t('Loading visualizations'),
+            errorTitle: i18n.t("Couldn't load visualizations"),
+            errorText: i18n.t(
+                'There was a problem loading visualizations. Try again or contact your system administrator.'
+            ),
+            noDataText: i18n.t(
+                'No visualizations found. Click New visualization to get started.'
+            ),
+            noFilteredDataText: i18n.t(
+                "No visualizations found. Try adjusting your search or filter options to find what you're looking for."
+            ),
+            newButtonLabel: i18n.t('New visualization'),
+        },
+        [AO_TYPE_MAP]: {
+            modalTitle: i18n.t('Open a map'),
+            loadingText: i18n.t('Loading maps'),
+            errorTitle: i18n.t("Couldn't load maps"),
+            errorText: i18n.t(
+                'There was a problem loading maps. Try again or contact your system administrator.'
+            ),
+            noDataText: i18n.t('No maps found. Click New map to get started.'),
+            noFilteredDataText: i18n.t(
+                "No maps found. Try adjusting your search or filter options to find what you're looking for."
+            ),
+            newButtonLabel: i18n.t('New map'),
+        },
+        [AO_TYPE_EVENT_VISUALIZATION]: {
+            modalTitle: i18n.t('Open a line list'),
+            loadingText: i18n.t('Loading line lists'),
+            errorTitle: i18n.t("Couldn't load line lists"),
+            errorText: i18n.t(
+                'There was a problem loading line lists. Try again or contact your system administrator.'
+            ),
+            noDataText: i18n.t(
+                'No line lists found. Click New line list to get started.'
+            ),
+            noFilteredDataText: i18n.t(
+                "No line lists found. Try adjusting your search or filter options to find what you're looking for."
+            ),
+            newButtonLabel: i18n.t('New line list'),
+        },
+    }
 
-export const getTranslatedString = (type, key) =>
-    (texts[type] || texts[NO_TYPE])[key]
+    return (texts[type] || texts[NO_TYPE])[key]
+}

src/components/Options/VisualizationOptions.js

@@ -1,4 +1,3 @@
-import i18n from '@dhis2/d2-i18n'
 import {
     ButtonStrip,
     Modal,
@@ -14,6 +13,7 @@ import {
 } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React, { useState } from 'react'
+import i18n from '../../locales/index.js'
 import {
     modalContent,
     tabSection,

src/components/RichText/Editor/Editor.js

@@ -1,4 +1,3 @@
-import i18n from '@dhis2/d2-i18n'
 import {
     Button,
     Popover,
@@ -14,6 +13,7 @@ import {
 import cx from 'classnames'
 import PropTypes from 'prop-types'
 import React, { forwardRef, useRef, useEffect, useState } from 'react'
+import i18n from '../../../locales/index.js'
 import { UserMentionWrapper } from '../../UserMention/UserMentionWrapper.js'
 import { Parser } from '../Parser/Parser.js'
 import {

src/components/TranslationDialog/TranslationModal/LocalesSelect.js

@@ -1,8 +1,8 @@
 import { useDataQuery } from '@dhis2/app-runtime'
-import i18n from '@dhis2/d2-i18n'
 import { SingleSelect, SingleSelectOption } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React from 'react'
+import i18n from '../../../locales/index.js'
 
 const query = {
     locales: {