Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

API & Client - add API error messages translation

Browse Source
This commit is contained in:
Sam
2019-09-16 17:54:21 +02:00
parent c5c84c4090
commit f6389f1cdd
20 changed files with 118 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fittrackee_client/src/components/Activities/index.jsx
View File

@ -55,7 +55,7 @@ class Activities extends React.Component {
<title>FitTrackee - {t('common:Workouts')}</title>
</Helmet>
{message ? (
<code>{message}</code>
<code>{t(`messages:${message}`)}</code>
) : (
<div className="container history">
<div className="row">

2
fittrackee_client/src/components/Activity/ActivityAddOrEdit.jsx
View File

@ -38,7 +38,7 @@ class ActivityAddEdit extends React.Component {
</Helmet>
<br />
<br />
{message && <code>{message}</code>}
{message && <code>{t(`messages:${message}`)}</code>}
<div className="container">
<div className="row">
<div className="col-md-2" />

2
fittrackee_client/src/components/Activity/ActivityDisplay/index.jsx
View File

@ -85,7 +85,7 @@ class ActivityDisplay extends React.Component {
<title>FitTrackee - {title}</title>
</Helmet>
{message ? (
<code>{message}</code>
<code>{t(`messages:${message}`)}</code>
) : (
<div className="container">
{displayModal && (

2
fittrackee_client/src/components/Dashboard/index.jsx
View File

@ -45,7 +45,7 @@ class DashBoard extends React.Component {
<title>FitTrackee - {t('common:Dashboard')}</title>
</Helmet>
{message ? (
<code>{message}</code>
<code>{t(`messages:${message}`)}</code>
) : (
activities &&
sports.length > 0 && (

2
fittrackee_client/src/components/User/Profile.jsx
View File

@ -20,7 +20,7 @@ function Profile({ message, onDeletePicture, onUploadPicture, t, user }) {
<Helmet>
<title>FitTrackee - {t('user:Profile')}</title>
</Helmet>
{message !== '' && <code>{message}</code>}
{message !== '' && <code>{t(`messages:${message}`)}</code>}
<div className="container">
<h1 className="page-title">{t('user:Profile')}</h1>
<div className="row">

2
fittrackee_client/src/components/User/ProfileEdit.jsx
View File

@ -58,7 +58,7 @@ class ProfileEdit extends React.Component {
<Helmet>
<title>FitTrackee - {t('user:Profile Edition')}</title>
</Helmet>
{message !== '' && <code>{message}</code>}
{message !== '' && <code>{t(`messages:${message}`)}</code>}
{formData.isAuthenticated && (
<div className="container">
<h1 className="page-title">{t('user:Profile Edition')}</h1>

39
fittrackee_client/src/components/User/UserForm.jsx
View File

@ -5,6 +5,7 @@ import { Redirect } from 'react-router-dom'
import Form from './Form'
import { handleUserFormSubmit } from '../../actions/user'
import { isLoggedIn } from '../../utils'
import { withTranslation } from 'react-i18next'
class UserForm extends React.Component {
constructor(props, context) {
@ -38,7 +39,13 @@ class UserForm extends React.Component {
}
render() {
const { formType, message, messages, onHandleUserFormSubmit } = this.props
const {
formType,
message,
messages,
onHandleUserFormSubmit,
t,
} = this.props
const { formData } = this.state
return (
<div>
@ -46,12 +53,12 @@ class UserForm extends React.Component {
<Redirect to="/" />
) : (
<div>
{message !== '' && <code>{message}</code>}
{message !== '' && <code>{t(`messages:${message}`)}</code>}
{messages.length > 0 && (
<code>
<ul>
{messages.map(msg => (
<li key={msg.id}>{msg.value}</li>
<li key={msg.id}>{t(`messages:${msg.value}`)}</li>
))}
</ul>
</code>
@ -71,15 +78,17 @@ class UserForm extends React.Component {
)
}
}
export default connect(
state => ({
location: state.router.location,
message: state.message,
messages: state.messages,
}),
dispatch => ({
onHandleUserFormSubmit: (formData, formType) => {
dispatch(handleUserFormSubmit(formData, formType))
},
})
)(UserForm)
export default withTranslation()(
connect(
state => ({
location: state.router.location,
message: state.message,
messages: state.messages,
}),
dispatch => ({
onHandleUserFormSubmit: (formData, formType) => {
dispatch(handleUserFormSubmit(formData, formType))
},
})
)(UserForm)
)