diff --git a/Makefile b/Makefile index 6aef42c40..652eae3ca 100755 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ export TRANSIFEX_RESOURCE = frontend-app-discussions transifex_resource = frontend-app-discussions -transifex_langs = "ar,fr,es_419,zh_CN,tr_TR,pl,fr_CA,fr_FR,de_DE,it_IT,pt_PT,uk,ru,hi,cs,es_AR,es_ES,fa_IR" +transifex_langs = "ar,cs,de_DE,es_419,es_AR,es_ES,fa_IR,fr,fr_CA,fr_FR,hi,it_IT,pl,pt_PT,tr_TR,uk,ru,zh_CN" intl_imports = ./node_modules/.bin/intl-imports.js transifex_utils = ./node_modules/.bin/transifex-utils.js diff --git a/src/discussions/common/ActionsDropdown.jsx b/src/discussions/common/ActionsDropdown.jsx index f699473c2..110219d3d 100644 --- a/src/discussions/common/ActionsDropdown.jsx +++ b/src/discussions/common/ActionsDropdown.jsx @@ -68,7 +68,7 @@ const ActionsDropdown = ({ disabled={disabled} size={iconSize} ref={buttonRef} - iconClassNames={dropDownIconSize ? 'dropdown-icon-dimentions' : ''} + iconClassNames={dropDownIconSize ? 'dropdown-icon-dimensions' : ''} />
{ @@ -30,10 +30,10 @@ const Confirmation = ({ - + {intl.formatMessage(messages.confirmationCancel)} - @@ -45,16 +45,16 @@ const Confirmation = ({ Confirmation.propTypes = { isOpen: PropTypes.bool.isRequired, onClose: PropTypes.func.isRequired, - comfirmAction: PropTypes.func.isRequired, + confirmAction: PropTypes.func.isRequired, title: PropTypes.string.isRequired, description: PropTypes.string.isRequired, - closeButtonVaraint: PropTypes.string, + closeButtonVariant: PropTypes.string, confirmButtonVariant: PropTypes.string, confirmButtonText: PropTypes.string, }; Confirmation.defaultProps = { - closeButtonVaraint: 'default', + closeButtonVariant: 'default', confirmButtonVariant: 'primary', confirmButtonText: '', }; diff --git a/src/discussions/common/HoverCard.jsx b/src/discussions/common/HoverCard.jsx index 05c51cbe2..62eab556f 100644 --- a/src/discussions/common/HoverCard.jsx +++ b/src/discussions/common/HoverCard.jsx @@ -31,7 +31,7 @@ const HoverCard = ({ const intl = useIntl(); const { enableInContextSidebar } = useContext(DiscussionContext); const { isClosed } = useContext(PostCommentsContext); - const isUserPrivilagedInPostingRestriction = useUserPostingEnabled(); + const isUserPrivilegedInPostingRestriction = useUserPostingEnabled(); return (
- {isUserPrivilagedInPostingRestriction && ( + {isUserPrivilegedInPostingRestriction && (
@@ -90,7 +90,7 @@ const CommentsView = ({ endorsed }) => { {handleDefinition(messages.responseCount, unEndorsedCommentsIds.length)} {unEndorsedCommentsIds.length === 0 &&
} {handleComments(unEndorsedCommentsIds, false)} - {(isUserPrivilagedInPostingRestriction && !!unEndorsedCommentsIds.length && !isClosed) && ( + {(isUserPrivilegedInPostingRestriction && !!unEndorsedCommentsIds.length && !isClosed) && (
{!addingResponse && (
) : ( - !isClosed && isUserPrivilagedInPostingRestriction && (inlineReplies.length >= 5) && ( + !isClosed && isUserPrivilegedInPostingRestriction && (inlineReplies.length >= 5) && (
diff --git a/src/discussions/posts/post-editor/PostEditor.test.jsx b/src/discussions/posts/post-editor/PostEditor.test.jsx index 6c8851b5e..1c8bda181 100644 --- a/src/discussions/posts/post-editor/PostEditor.test.jsx +++ b/src/discussions/posts/post-editor/PostEditor.test.jsx @@ -118,7 +118,7 @@ describe('PostEditor', () => { expect(screen.queryAllByRole('radio')).toHaveLength(2); // 2 categories with 4 subcategories each expect(screen.queryAllByText(/category-\d-topic \d/)).toHaveLength(8); - // 3 non courseare topics + // 3 non courseware topics expect(screen.queryAllByText(/ncw-topic \d/)).toHaveLength(3); expect(screen.queryByText('cohort', { exact: false })).not.toBeInTheDocument(); expect(screen.queryByText('Post anonymously')).not.toBeInTheDocument(); @@ -199,7 +199,7 @@ describe('PostEditor', () => { await renderComponent(); // Initially the user can't select a cohort expect(screen.queryByRole('combobox', { name: /cohort visibility/i })).not.toBeInTheDocument(); - // All coursweare topics are divided + // All courseware topics are divided [1, 2].forEach(catId => { [1, 2, 3, 4].forEach((topicId) => { act(() => { diff --git a/src/discussions/posts/post/LikeButton.jsx b/src/discussions/posts/post/LikeButton.jsx index 6adee2de8..afc4b1a60 100644 --- a/src/discussions/posts/post/LikeButton.jsx +++ b/src/discussions/posts/post/LikeButton.jsx @@ -31,10 +31,10 @@ const LikeButton = ({ count, onClick, voted }) => {
diff --git a/src/discussions/posts/post/Post.jsx b/src/discussions/posts/post/Post.jsx index 0911dc762..1f7ee1f92 100644 --- a/src/discussions/posts/post/Post.jsx +++ b/src/discussions/posts/post/Post.jsx @@ -138,8 +138,8 @@ const Post = ({ handleAddResponseButton }) => { title={intl.formatMessage(messages.deletePostTitle)} description={intl.formatMessage(messages.deletePostDescription)} onClose={hideDeleteConfirmation} - comfirmAction={handleDeleteConfirmation} - closeButtonVaraint="tertiary" + confirmAction={handleDeleteConfirmation} + closeButtonVariant="tertiary" confirmButtonText={intl.formatMessage(messages.deleteConfirmationDelete)} /> {!abuseFlagged && ( @@ -148,7 +148,7 @@ const Post = ({ handleAddResponseButton }) => { title={intl.formatMessage(messages.reportPostTitle)} description={intl.formatMessage(messages.reportPostDescription)} onClose={hideReportConfirmation} - comfirmAction={handleReportConfirmation} + confirmAction={handleReportConfirmation} confirmButtonVariant="danger" /> )} diff --git a/src/discussions/posts/post/PostFooter.jsx b/src/discussions/posts/post/PostFooter.jsx index e57ac8bc4..131e60bcd 100644 --- a/src/discussions/posts/post/PostFooter.jsx +++ b/src/discussions/posts/post/PostFooter.jsx @@ -56,8 +56,8 @@ const PostFooter = ({ return true; }} iconAs={Icon} - iconClassNames="follow-icon-dimentions" - className="post-footer-icon-dimentions" + iconClassNames="follow-icon-dimensions" + className="post-footer-icon-dimensions" alt="Follow" /> diff --git a/src/discussions/tours/data/api.js b/src/discussions/tours/data/api.js index e01bafe59..938f66584 100644 --- a/src/discussions/tours/data/api.js +++ b/src/discussions/tours/data/api.js @@ -9,7 +9,7 @@ export const getDiscussionTourUrl = () => `${getConfig().LMS_BASE_URL}/api/user_ * This function makes an HTTP GET request to the API to retrieve a list of tours for the authenticated user. * @returns {Promise} - A promise that resolves to the API response data. */ -export async function getDiscssionTours() { +export async function getDiscussionTours() { const { data } = await getAuthenticatedHttpClient() .get(getDiscussionTourUrl()); return data; diff --git a/src/discussions/tours/data/thunks.js b/src/discussions/tours/data/thunks.js index 7cebe0548..aa6fa4e6d 100644 --- a/src/discussions/tours/data/thunks.js +++ b/src/discussions/tours/data/thunks.js @@ -1,7 +1,7 @@ import { camelCaseObject } from '@edx/frontend-platform'; import { logError } from '@edx/frontend-platform/logging'; -import { getDiscssionTours, updateDiscussionTour } from './api'; +import { getDiscussionTours, updateDiscussionTour } from './api'; import { discussionsTourRequest, discussionsToursRequestError, @@ -21,7 +21,7 @@ export function fetchDiscussionTours() { return async (dispatch) => { try { dispatch(discussionsTourRequest()); - const data = await getDiscssionTours(); + const data = await getDiscussionTours(); dispatch(fetchUserDiscussionsToursSuccess(camelCaseObject(normaliseTourData(data)))); } catch (error) { dispatch(discussionsToursRequestError()); diff --git a/src/i18n/index.js b/src/i18n/index.js index 480344a79..70e91f4ed 100644 --- a/src/i18n/index.js +++ b/src/i18n/index.js @@ -3,9 +3,8 @@ import { messages as headerMessages } from '@edx/frontend-component-header'; import { messages as paragonMessages } from '@edx/paragon'; import arMessages from './messages/ar.json'; -// no need to import en messages-- they are in the defaultMessage field import csMessages from './messages/cs.json'; -import deMessages from './messages/de_DE.json'; +import deDEMessages from './messages/de_DE.json'; import es419Messages from './messages/es_419.json'; import esARMessages from './messages/es_AR.json'; import esESMessages from './messages/es_ES.json'; @@ -20,27 +19,28 @@ import ptPTMessages from './messages/pt_PT.json'; import ruMessages from './messages/ru.json'; import trTRMessages from './messages/tr_TR.json'; import ukMessages from './messages/uk.json'; -import zhcnMessages from './messages/zh_CN.json'; +import zhCNMessages from './messages/zh_CN.json'; +// no need to import en messages-- they are in the defaultMessage field const appMessages = { ar: arMessages, - de: deMessages, + cs: csMessages, + 'de-de': deDEMessages, 'es-419': es419Messages, + 'es-ar': esARMessages, + 'es-es': esESMessages, + 'fa-ir': faIRMessages, fr: frMessages, 'fr-ca': frCAMessages, 'fr-fr': frFRMessages, + hi: hiMessages, 'it-it': itITMessages, pl: plMessages, - 'tr-tr': trTRMessages, - 'zh-cn': zhcnMessages, 'pt-pt': ptPTMessages, + 'tr-tr': trTRMessages, uk: ukMessages, ru: ruMessages, - hi: hiMessages, - cs: csMessages, - 'es-AR': esARMessages, - 'es-ES': esESMessages, - 'fa-IR': faIRMessages, + 'zh-cn': zhCNMessages, }; export default [ diff --git a/src/index.scss b/src/index.scss index 8fdbb139f..613e10cd7 100755 --- a/src/index.scss +++ b/src/index.scss @@ -69,22 +69,22 @@ $fa-font-path: "~font-awesome/fonts"; font-family: "Inter"; } -.post-footer-icon-dimentions { +.post-footer-icon-dimensions { width: 32px !important; height: 32px !important; } -.like-icon-dimentions { +.like-icon-dimensions { width: 21px !important; height: 23px !important; } -.follow-icon-dimentions { +.follow-icon-dimensions { width: 21px !important; height: 24px !important; } -.dropdown-icon-dimentions { +.dropdown-icon-dimensions { width: 20px !important; height: 21px !important; } @@ -469,7 +469,7 @@ header { } } -.spinner-dimentions { +.spinner-dimensions { height: 24px !important; width: 24px !important; }