From c471f2b3e42b88a89d45a5d996c6db7b773a120b Mon Sep 17 00:00:00 2001 From: Ben Warzeski Date: Tue, 7 Jun 2022 17:12:54 -0400 Subject: [PATCH] feat: cleaner i18n --- package-lock.json | 14 +++++++------- package.json | 2 +- src/containers/EmailSettingsModal/index.jsx | 2 +- src/containers/LearnerDashboardHeader/index.jsx | 5 ++++- .../components/ProgramCard.jsx | 2 +- src/containers/RelatedProgramsModal/index.jsx | 2 +- .../components/ConfirmPane.jsx | 2 +- .../components/FinishedPane.jsx | 2 +- .../UnenrollConfirmModal/components/ReasonPane.jsx | 2 +- 9 files changed, 18 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 97dd7ee..2a17f75 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@edx/brand": "npm:@edx/brand-edx.org@^2.0.3", "@edx/frontend-component-footer": "10.1.6", "@edx/frontend-component-header": "^2.4.6", - "@edx/frontend-platform": "^2.2.0", + "@edx/frontend-platform": "^2.3.0", "@edx/paragon": "19.25.0", "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-brands-svg-icons": "^5.15.4", @@ -3425,9 +3425,9 @@ } }, "node_modules/@edx/frontend-platform": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@edx/frontend-platform/-/frontend-platform-2.2.0.tgz", - "integrity": "sha512-OyoAgFFZqUTi//KLhmH4ooN0yZH8q4ovYEG+/yyA1HTyPa1Du/xJR6a3igdKrlW/6yeDTMMHC9MDG31SGrK89w==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@edx/frontend-platform/-/frontend-platform-2.3.0.tgz", + "integrity": "sha512-vZAw3eKJgUvD3wu8QOlCbNvuhe9YOGhdVuiTiFGMJKsYagJNMuQZxTJ2DwPCr7/gprJ65mboisJ3BF5IoFzVJA==", "dependencies": { "@cospired/i18n-iso-languages": "2.2.0", "@formatjs/intl-pluralrules": "^4.3.3", @@ -36146,9 +36146,9 @@ } }, "@edx/frontend-platform": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@edx/frontend-platform/-/frontend-platform-2.2.0.tgz", - "integrity": "sha512-OyoAgFFZqUTi//KLhmH4ooN0yZH8q4ovYEG+/yyA1HTyPa1Du/xJR6a3igdKrlW/6yeDTMMHC9MDG31SGrK89w==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@edx/frontend-platform/-/frontend-platform-2.3.0.tgz", + "integrity": "sha512-vZAw3eKJgUvD3wu8QOlCbNvuhe9YOGhdVuiTiFGMJKsYagJNMuQZxTJ2DwPCr7/gprJ65mboisJ3BF5IoFzVJA==", "requires": { "@cospired/i18n-iso-languages": "2.2.0", "@formatjs/intl-pluralrules": "^4.3.3", diff --git a/package.json b/package.json index e3b347c..2fc1561 100755 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@edx/brand": "npm:@edx/brand-edx.org@^2.0.3", "@edx/frontend-component-footer": "10.1.6", "@edx/frontend-component-header": "^2.4.6", - "@edx/frontend-platform": "^2.2.0", + "@edx/frontend-platform": "^2.3.0", "@edx/paragon": "19.25.0", "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-brands-svg-icons": "^5.15.4", diff --git a/src/containers/EmailSettingsModal/index.jsx b/src/containers/EmailSettingsModal/index.jsx index 21a80f6..6ffcdaa 100644 --- a/src/containers/EmailSettingsModal/index.jsx +++ b/src/containers/EmailSettingsModal/index.jsx @@ -1,8 +1,8 @@ import React from 'react'; import { useDispatch } from 'react-redux'; import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; +import { useIntl } from '@edx/frontend-platform/i18n'; import { ActionRow, Button, diff --git a/src/containers/LearnerDashboardHeader/index.jsx b/src/containers/LearnerDashboardHeader/index.jsx index 938dba6..122bb4e 100644 --- a/src/containers/LearnerDashboardHeader/index.jsx +++ b/src/containers/LearnerDashboardHeader/index.jsx @@ -1,5 +1,6 @@ import React, { useContext } from 'react'; -import { useIntl } from 'react-intl'; + +import { useIntl } from '@edx/frontend-platform/i18n'; import { AppContext } from '@edx/frontend-platform/react'; import { Program } from '@edx/paragon/icons'; import { Button } from '@edx/paragon'; @@ -10,6 +11,8 @@ import messages from './messages'; export const LearnerDashboardHeader = () => { const { authenticatedUser } = useContext(AppContext); + const context = useContext(AppContext); + console.log({ context }); const { formatMessage } = useIntl(); return (
diff --git a/src/containers/RelatedProgramsModal/components/ProgramCard.jsx b/src/containers/RelatedProgramsModal/components/ProgramCard.jsx index ed8072f..868c944 100644 --- a/src/containers/RelatedProgramsModal/components/ProgramCard.jsx +++ b/src/containers/RelatedProgramsModal/components/ProgramCard.jsx @@ -1,6 +1,6 @@ import React from 'react'; -import { useIntl } from 'react-intl'; +import { useIntl } from '@edx/frontend-platform/i18n'; import { Badge, Card, diff --git a/src/containers/RelatedProgramsModal/index.jsx b/src/containers/RelatedProgramsModal/index.jsx index 8511aed..66093d6 100644 --- a/src/containers/RelatedProgramsModal/index.jsx +++ b/src/containers/RelatedProgramsModal/index.jsx @@ -1,8 +1,8 @@ /* eslint-disable quotes */ import React from 'react'; import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; +import { useIntl } from '@edx/frontend-platform/i18n'; import { CardGrid, ModalDialog } from '@edx/paragon'; import shapes from 'data/services/lms/shapes'; diff --git a/src/containers/UnenrollConfirmModal/components/ConfirmPane.jsx b/src/containers/UnenrollConfirmModal/components/ConfirmPane.jsx index c9b78e9..26bd13e 100644 --- a/src/containers/UnenrollConfirmModal/components/ConfirmPane.jsx +++ b/src/containers/UnenrollConfirmModal/components/ConfirmPane.jsx @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; +import { useIntl } from '@edx/frontend-platform/i18n'; import { ActionRow, Button, diff --git a/src/containers/UnenrollConfirmModal/components/FinishedPane.jsx b/src/containers/UnenrollConfirmModal/components/FinishedPane.jsx index 767b310..75748f3 100644 --- a/src/containers/UnenrollConfirmModal/components/FinishedPane.jsx +++ b/src/containers/UnenrollConfirmModal/components/FinishedPane.jsx @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; +import { useIntl } from '@edx/frontend-platform/i18n'; import { ActionRow, Button, diff --git a/src/containers/UnenrollConfirmModal/components/ReasonPane.jsx b/src/containers/UnenrollConfirmModal/components/ReasonPane.jsx index 382a70c..425c686 100644 --- a/src/containers/UnenrollConfirmModal/components/ReasonPane.jsx +++ b/src/containers/UnenrollConfirmModal/components/ReasonPane.jsx @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; +import { useIntl } from '@edx/frontend-platform/i18n'; import { ActionRow, Button,