Skip to content

Commit

Permalink
More transtated strings
Browse files Browse the repository at this point in the history
  • Loading branch information
SemaiCZE committed Oct 31, 2017
1 parent dede7eb commit c509fbd
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 11 deletions.
23 changes: 14 additions & 9 deletions src/components/forms/EditAssignmentForm/EditAssignmentForm.js
Original file line number Diff line number Diff line change
@@ -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';

Expand All @@ -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,
Expand All @@ -21,15 +22,16 @@ const EditAssignmentForm = ({
submitSucceeded: hasSucceeded,
asyncValidating,
invalid,
formValues: { firstDeadline, allowSecondDeadline, localizedTexts } = {}
formValues: { firstDeadline, allowSecondDeadline, localizedTexts } = {},
intl: { locale }
}) =>
<div>
<FormBox
title={
<FormattedMessage
id="app.editAssignmentForm.title"
defaultMessage="Edit assignment {name}"
values={{ name: assignment.name }}
values={{ name: getLocalizedName(assignment, locale) }}
/>
}
successful={hasSucceeded}
Expand Down Expand Up @@ -231,7 +233,8 @@ EditAssignmentForm.propTypes = {
PropTypes.string
]),
localizedTexts: PropTypes.array
})
}),
intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
};

const isNonNegativeInteger = n =>
Expand Down Expand Up @@ -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)
);
5 changes: 3 additions & 2 deletions src/components/forms/EditExerciseForm/EditExerciseForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -50,15 +51,15 @@ const EditExerciseForm = ({
invalid,
asyncValidating,
formValues: { localizedTexts } = {},
intl: { formatMessage },
intl: { formatMessage, locale },
links: { EXERCISE_EDIT_CONFIG_URI_FACTORY }
}) =>
<FormBox
title={
<FormattedMessage
id="app.editExerciseForm.title"
defaultMessage="Edit exercise {name}"
values={{ name: exercise.name }}
values={{ name: getLocalizedName(exercise, locale) }}
/>
}
succeeded={hasSucceeded}
Expand Down

0 comments on commit c509fbd

Please sign in to comment.