diff --git a/client/package.json b/client/package.json index 8601ab979..a0b40b717 100644 --- a/client/package.json +++ b/client/package.json @@ -73,7 +73,6 @@ "react-dropzone": "^11.0.1", "react-error-boundary": "^3.0.2", "react-hotkeys-hook": "^3.0.3", - "react-intl": "^3.12.0", "react-intl-universal": "^2.4.7", "react-loadable": "^5.5.0", "react-query": "^3.6.0", diff --git a/client/src/containers/FinancialStatements/BalanceSheet/components.js b/client/src/containers/FinancialStatements/BalanceSheet/components.js index f8d90e2d4..9439acb74 100644 --- a/client/src/containers/FinancialStatements/BalanceSheet/components.js +++ b/client/src/containers/FinancialStatements/BalanceSheet/components.js @@ -2,7 +2,7 @@ import React from 'react'; import { Button } from '@blueprintjs/core'; import { Icon, If } from 'components'; import { useBalanceSheetContext } from './BalanceSheetProvider'; -import { FormattedMessage as T } from 'react-intl'; +import { FormattedMessage as T } from 'components'; import FinancialLoadingBar from '../FinancialLoadingBar'; /** diff --git a/client/src/containers/FinancialStatements/CashFlowStatement/components.js b/client/src/containers/FinancialStatements/CashFlowStatement/components.js index 37c8dcb8d..865825710 100644 --- a/client/src/containers/FinancialStatements/CashFlowStatement/components.js +++ b/client/src/containers/FinancialStatements/CashFlowStatement/components.js @@ -1,7 +1,7 @@ import React from 'react'; import { Button } from '@blueprintjs/core'; import { Icon, If } from 'components'; -import { FormattedMessage as T } from 'react-intl'; +import { FormattedMessage as T } from 'components'; import { dynamicColumns } from './utils'; import { useCashFlowStatementContext } from './CashFlowStatementProvider'; diff --git a/client/src/containers/FinancialStatements/GeneralLedger/components.js b/client/src/containers/FinancialStatements/GeneralLedger/components.js index a08ad8dd6..e8a307da9 100644 --- a/client/src/containers/FinancialStatements/GeneralLedger/components.js +++ b/client/src/containers/FinancialStatements/GeneralLedger/components.js @@ -2,7 +2,7 @@ import React from 'react'; import intl from 'react-intl-universal'; import { Button } from '@blueprintjs/core'; import { Icon, If } from 'components'; -import { FormattedMessage as T } from 'react-intl'; +import { FormattedMessage as T } from 'components'; import { getForceWidth, getColumnWidth } from 'utils'; import { useGeneralLedgerContext } from './GeneralLedgerProvider'; diff --git a/client/src/containers/FinancialStatements/InventoryItemDetails/components.js b/client/src/containers/FinancialStatements/InventoryItemDetails/components.js index 915cd7ee2..ca7e71c5a 100644 --- a/client/src/containers/FinancialStatements/InventoryItemDetails/components.js +++ b/client/src/containers/FinancialStatements/InventoryItemDetails/components.js @@ -1,7 +1,7 @@ import React from 'react'; import { Button } from '@blueprintjs/core'; import { Icon, If } from 'components'; -import { FormattedMessage as T } from 'react-intl'; +import { FormattedMessage as T } from 'components'; import { dynamicColumns } from './utils'; import FinancialLoadingBar from '../FinancialLoadingBar'; diff --git a/client/src/containers/FinancialStatements/ProfitLossSheet/components.js b/client/src/containers/FinancialStatements/ProfitLossSheet/components.js index 46a8f7ac1..bfc4b54f1 100644 --- a/client/src/containers/FinancialStatements/ProfitLossSheet/components.js +++ b/client/src/containers/FinancialStatements/ProfitLossSheet/components.js @@ -1,7 +1,7 @@ import React from 'react'; import { Button } from '@blueprintjs/core'; import { Icon, If } from 'components'; -import { FormattedMessage as T } from 'react-intl'; +import { FormattedMessage as T } from 'components'; import { useProfitLossSheetContext } from './ProfitLossProvider'; import FinancialLoadingBar from '../FinancialLoadingBar'; diff --git a/client/src/containers/FinancialStatements/reducers.js b/client/src/containers/FinancialStatements/reducers.js index d74cb844e..4e6edfcbf 100644 --- a/client/src/containers/FinancialStatements/reducers.js +++ b/client/src/containers/FinancialStatements/reducers.js @@ -1,7 +1,7 @@ import React from 'react'; import { chain } from 'lodash'; import moment from 'moment'; -import { FormattedMessage as T } from 'react-intl'; +import { FormattedMessage as T } from 'components'; export const balanceSheetRowsReducer = (accounts) => { return accounts.map((account) => { diff --git a/client/src/containers/Items/ItemsDataTable.js b/client/src/containers/Items/ItemsDataTable.js index 8f958651c..f352bcc34 100644 --- a/client/src/containers/Items/ItemsDataTable.js +++ b/client/src/containers/Items/ItemsDataTable.js @@ -1,6 +1,6 @@ import React from 'react'; import { useHistory } from 'react-router-dom'; -import { FormattedMessage as T } from 'react-intl'; +import { FormattedMessage as T } from 'components'; import { DataTable } from 'components'; diff --git a/client/src/containers/Views/ViewFormPage.js b/client/src/containers/Views/ViewFormPage.js index 469f7f223..0cc4181d2 100644 --- a/client/src/containers/Views/ViewFormPage.js +++ b/client/src/containers/Views/ViewFormPage.js @@ -2,7 +2,7 @@ import React, {useEffect, useState, useCallback} from 'react'; import { useAsync } from 'react-use'; import { useParams } from 'react-router-dom'; import { Intent, Alert } from '@blueprintjs/core'; -import { FormattedMessage as T, FormattedHTMLMessage } from 'react-intl'; +import { FormattedMessage as T, FormattedHTMLMessage } from 'components'; import DashboardInsider from 'components/Dashboard/DashboardInsider'; import DashboardPageContent from 'components/Dashboard/DashboardPageContent'; diff --git a/client/src/services/intl.js b/client/src/services/intl.js deleted file mode 100644 index a608eb611..000000000 --- a/client/src/services/intl.js +++ /dev/null @@ -1,27 +0,0 @@ -import { createIntl, createIntlCache } from 'react-intl'; -// import messages from 'lang/en/index.json'; -import arabicMessages from 'lang/ar/index.json'; -import englishMessages from 'lang/en/index.json'; - -import { setLocale } from 'yup'; -import { locale } from 'lang/en/locale'; - -// This is optional but highly recommended since it prevents memory leak -const cache = createIntlCache(); - -// Creates globa intl instance. -const intl = createIntl( - { - locale: 'en', - messages, - }, - cache, -); - -setLocale(locale); - -const { formatMessage } = intl; - -export { formatMessage }; - -export default intl;