diff --git a/src/components/DataDimension/Calculation/FormulaField.js b/src/components/DataDimension/Calculation/FormulaField.js index 388394deb..79cdcea82 100644 --- a/src/components/DataDimension/Calculation/FormulaField.js +++ b/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' diff --git a/src/components/PivotTable/PivotTableValueCell.js b/src/components/PivotTable/PivotTableValueCell.js index f20fe554d..8d1619cb1 100644 --- a/src/components/PivotTable/PivotTableValueCell.js +++ b/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 { diff --git a/src/components/Toolbar/InterpretationsAndDetailsToggler.js b/src/components/Toolbar/InterpretationsAndDetailsToggler.js index 8bb8abeb3..ee8e7c6d5 100644 --- a/src/components/Toolbar/InterpretationsAndDetailsToggler.js +++ b/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 = ({ diff --git a/src/components/Toolbar/UpdateButton.js b/src/components/Toolbar/UpdateButton.js index fdfaa06e7..2ecab69ea 100644 --- a/src/components/Toolbar/UpdateButton.js +++ b/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 }) => ( diff --git a/src/modules/pivotTable/PivotTableEngine.js b/src/modules/pivotTable/PivotTableEngine.js index ad798e686..a50d2737d 100644 --- a/src/modules/pivotTable/PivotTableEngine.js +++ b/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,