diff --git a/src/components/forms/EditAssignmentForm/EditAssignmentForm.js b/src/components/forms/EditAssignmentForm/EditAssignmentForm.js index 56ddb7000..e71055e58 100644 --- a/src/components/forms/EditAssignmentForm/EditAssignmentForm.js +++ b/src/components/forms/EditAssignmentForm/EditAssignmentForm.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { reduxForm, Field, FieldArray, touch } from 'redux-form'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage, injectIntl } from 'react-intl'; import { Alert, HelpBlock } from 'react-bootstrap'; import isNumeric from 'validator/lib/isNumeric'; @@ -11,6 +11,7 @@ import LocalizedTextsFormField from '../LocalizedTextsFormField'; import SubmitButton from '../SubmitButton'; import { validateAssignment } from '../../../redux/modules/assignments'; +import { getLocalizedName } from '../../../helpers/getLocalizedData'; const EditAssignmentForm = ({ initialValues: assignment, @@ -21,7 +22,8 @@ const EditAssignmentForm = ({ submitSucceeded: hasSucceeded, asyncValidating, invalid, - formValues: { firstDeadline, allowSecondDeadline, localizedTexts } = {} + formValues: { firstDeadline, allowSecondDeadline, localizedTexts } = {}, + intl: { locale } }) =>
} successful={hasSucceeded} @@ -231,7 +233,8 @@ EditAssignmentForm.propTypes = { PropTypes.string ]), localizedTexts: PropTypes.array - }) + }), + intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired }; const isNonNegativeInteger = n => @@ -438,8 +441,10 @@ const asyncValidate = (values, dispatch, { assignment: { id, version } }) => .catch(errors => reject(errors)) ); -export default reduxForm({ - form: 'editAssignment', - validate, - asyncValidate -})(EditAssignmentForm); +export default injectIntl( + reduxForm({ + form: 'editAssignment', + validate, + asyncValidate + })(EditAssignmentForm) +); diff --git a/src/components/forms/EditExerciseForm/EditExerciseForm.js b/src/components/forms/EditExerciseForm/EditExerciseForm.js index 99acf18a7..c7a6c9856 100644 --- a/src/components/forms/EditExerciseForm/EditExerciseForm.js +++ b/src/components/forms/EditExerciseForm/EditExerciseForm.js @@ -20,6 +20,7 @@ import Button from '../../widgets/FlatButton'; import LocalizedTextsFormField from '../LocalizedTextsFormField'; import { validateExercise } from '../../../redux/modules/exercises'; import withLinks from '../../../hoc/withLinks'; +import { getLocalizedName } from '../../../helpers/getLocalizedData'; if (canUseDOM) { require('codemirror/mode/yaml/yaml'); @@ -50,7 +51,7 @@ const EditExerciseForm = ({ invalid, asyncValidating, formValues: { localizedTexts } = {}, - intl: { formatMessage }, + intl: { formatMessage, locale }, links: { EXERCISE_EDIT_CONFIG_URI_FACTORY } }) => } succeeded={hasSucceeded}