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/DataDimension/Calculation/FormulaField.js

@@ -1,10 +1,10 @@
-import i18n from '@dhis2/d2-i18n'
 import { Center, CircularLoader } from '@dhis2/ui'
 import { useDroppable } from '@dnd-kit/core'
 import { SortableContext } from '@dnd-kit/sortable'
 import PropTypes from 'prop-types'
 import React from 'react'
 import FormulaIcon from '../../../assets/FormulaIcon.js'
+import i18n from '../../../locales/index.js'
 import DropZone from './DropZone.js'
 import FormulaItem from './FormulaItem.js'
 import styles from './styles/FormulaField.style.js'

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'

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/PivotTable/PivotTableValueCell.js

@@ -1,6 +1,6 @@
-import i18n from '@dhis2/d2-i18n'
 import PropTypes from 'prop-types'
 import React, { useRef } from 'react'
+import i18n from '../../locales/index.js'
 import { applyLegendSet } from '../../modules/pivotTable/applyLegendSet.js'
 import { CELL_TYPE_VALUE } from '../../modules/pivotTable/pivotTableConstants.js'
 import {

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/Toolbar/InterpretationsAndDetailsToggler.js

@@ -1,7 +1,7 @@
-import i18n from '@dhis2/d2-i18n'
 import { IconChevronRight24, IconChevronLeft24 } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React from 'react'
+import i18n from '../../locales/index.js'
 import menuButtonStyles from './MenuButton.styles.js'
 
 export const InterpretationsAndDetailsToggler = ({

src/components/Toolbar/UpdateButton.js

@@ -1,9 +1,9 @@
 import { CircularLoader } from '@dhis2-ui/loader'
-import i18n from '@dhis2/d2-i18n'
 import { colors } from '@dhis2/ui-constants'
 import { IconSync16 } from '@dhis2/ui-icons'
 import PropTypes from 'prop-types'
 import React from 'react'
+import i18n from '../../locales/index.js'
 import menuButtonStyles from './MenuButton.styles.js'
 
 export const UpdateButton = ({ onClick, disabled, loading, dataTest }) => (

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: {

src/components/TranslationDialog/TranslationModal/TranslationForm.js

@@ -1,5 +1,4 @@
 import { useAlert, useDataMutation } from '@dhis2/app-runtime'
-import i18n from '@dhis2/d2-i18n'
 import {
     CenteredContent,
     DataTable,
@@ -13,6 +12,7 @@
 } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React, { useEffect, useRef, useState } from 'react'
+import i18n from '../../../locales/index.js'
 import { LocalesSelect } from './LocalesSelect.js'
 import { TranslationModalActions } from './TranslationModalActions.js'
 
@@ -146,7 +146,7 @@
             fetchFieldsTranslations(fieldsToTranslate)
 
         fetchTranslations()
     }, [fieldsToTranslate])
 
     useEffect(() => setNewTranslations(translations), [translations])
 

src/components/TranslationDialog/TranslationModal/TranslationModal.js

@@ -1,4 +1,3 @@
-import i18n from '@dhis2/d2-i18n'
 import {
     CenteredContent,
     CircularLoader,
@@ -8,6 +7,7 @@ import {
 } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React, { useEffect, useState } from 'react'
+import i18n from '../../../locales/index.js'
 import { TranslationForm } from './TranslationForm.js'
 import { TranslationModalActions } from './TranslationModalActions.js'
 import { useTranslationsResults } from './useTranslationsResults.js'

src/components/TranslationDialog/TranslationModal/TranslationModalActions.js

@@ -1,8 +1,8 @@
 import { useDhis2ConnectionStatus } from '@dhis2/app-runtime'
-import i18n from '@dhis2/d2-i18n'
 import { Button, ButtonStrip, ModalActions } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React from 'react'
+import i18n from '../../../locales/index.js'
 import { OfflineTooltip } from '../../OfflineTooltip.js'
 
 const SaveButton = ({ disabled, loading, onClick }) => (

src/components/TranslationDialog/TranslationModal/useTranslationsResults.js

@@ -1,6 +1,6 @@
 import { useAlert, useDataQuery } from '@dhis2/app-runtime'
-import i18n from '@dhis2/d2-i18n'
 import { useRef } from 'react'
+import i18n from '../../../locales/index.js'
 
 export const useTranslationsResults = ({ resource }) => {
     const translationsQueryRef = useRef({

src/components/UserMention/UserList.js

@@ -1,7 +1,7 @@
-import i18n from '@dhis2/d2-i18n'
 import { MenuItem } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React from 'react'
+import i18n from '../../locales/index.js'
 
 export const UserList = ({ users, selectedUserIndex, onUserClick, pager }) => {
     return (

src/components/UserMention/UserMentionWrapper.js

@@ -1,4 +1,3 @@
-import i18n from '@dhis2/d2-i18n'
 import {
     CenteredContent,
     CircularLoader,
@@ -11,6 +10,7 @@ import {
 } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React, { useState, useRef } from 'react'
+import i18n from '../../locales/index.js'
 import {
     resolvedHeaderStyle,
     userMentionWrapperClasses,

src/modules/pivotTable/PivotTableEngine.js

@@ -1,5 +1,5 @@
-import i18n from '@dhis2/d2-i18n'
 import times from 'lodash/times'
+import i18n from '../../locales/index.js'
 import {
     DIMENSION_TYPE_DATA,
     DIMENSION_TYPE_DATA_ELEMENT_GROUP_SET,