Browse Source

fix of translation

AlexiCauvin 6 years ago
parent
commit
71a8d4d7e0

+ 5 - 5
frontend/i18next.scanner/en/translation.json View File

20
   "Notification": "Notification",
20
   "Notification": "Notification",
21
   "Archive Topic": "Archive Topic",
21
   "Archive Topic": "Archive Topic",
22
   "Deleted File": "Deleted File",
22
   "Deleted File": "Deleted File",
23
-  "Name :": "Name :",
24
-  "Email Adress :": "Email Adress :",
25
   "Send": "Send",
23
   "Send": "Send",
26
   "Workspace and notifications": "Workspace and notifications",
24
   "Workspace and notifications": "Workspace and notifications",
27
   "Workspace": "Workspace",
25
   "Workspace": "Workspace",
31
   "Password": "Password",
29
   "Password": "Password",
32
   "Change your name": "Change your name",
30
   "Change your name": "Change your name",
33
   "Change your email": "Change your email",
31
   "Change your email": "Change your email",
34
-  "Old Password": "Old Password",
35
-  "New Password": "New Password",
36
   "Change your Timezone": "Change your Timezone",
32
   "Change your Timezone": "Change your Timezone",
37
   "Calendar": "Calendar",
33
   "Calendar": "Calendar",
38
   "Access your personal calendar": "Access your personal calendar",
34
   "Access your personal calendar": "Access your personal calendar",
64
   "Workspace Calendar": "Workspace Calendar",
60
   "Workspace Calendar": "Workspace Calendar",
65
   "Each workspace has its own calendar.": "Each workspace has its own calendar.",
61
   "Each workspace has its own calendar.": "Each workspace has its own calendar.",
66
   "Email Adress": "Email Adress",
62
   "Email Adress": "Email Adress",
67
-  "Explore the workspace": "Explore the workspace"
63
+  "Explore the workspace": "Explore the workspace",
64
+  "Old password": "Old password",
65
+  "New password": "New password",
66
+  "Name:": "Name:",
67
+  "Email Adress:": "Email Adress:"
68
 }
68
 }

+ 5 - 5
frontend/i18next.scanner/fr/translation.json View File

20
   "Notification": "Notification",
20
   "Notification": "Notification",
21
   "Archive Topic": "Conversation archivée",
21
   "Archive Topic": "Conversation archivée",
22
   "Deleted File": "Fichier supprimé",
22
   "Deleted File": "Fichier supprimé",
23
-  "Name :": "Nom :",
24
-  "Email Adress :": "Adresse mail :",
25
   "Send": "Envoyer",
23
   "Send": "Envoyer",
26
   "Workspace and notifications": "Espace de travail & Notifications",
24
   "Workspace and notifications": "Espace de travail & Notifications",
27
   "Workspace": "Espace de travail",
25
   "Workspace": "Espace de travail",
31
   "Password": "Mot de passe",
29
   "Password": "Mot de passe",
32
   "Change your name": "Modifier votre nom",
30
   "Change your name": "Modifier votre nom",
33
   "Change your email": "Modifier votre email",
31
   "Change your email": "Modifier votre email",
34
-  "Old Password": "Ancien mot de passe",
35
-  "New Password": "Nouveau mot de passe",
36
   "Change your Timezone": "Modifier votre fuseau horaire",
32
   "Change your Timezone": "Modifier votre fuseau horaire",
37
   "Calendar": "Calendrier",
33
   "Calendar": "Calendrier",
38
   "Access your personal calendar": "Accéder à votre calendrier personnel",
34
   "Access your personal calendar": "Accéder à votre calendrier personnel",
64
   "Workspace Calendar": "Calendrier de l'espace de travail",
60
   "Workspace Calendar": "Calendrier de l'espace de travail",
65
   "Each workspace has its own calendar.": "Chaque espace de travail à son propre calendrier",
61
   "Each workspace has its own calendar.": "Chaque espace de travail à son propre calendrier",
66
   "Choose the role of the member": "Choisissez le rôle du membre",
62
   "Choose the role of the member": "Choisissez le rôle du membre",
67
-  "Email Adress": "Adresse email"
63
+  "Email Adress": "Adresse email",
64
+  "Old password": "Ancien mot de passe",
65
+  "New password": "Nouveau mot de passe",
66
+  "Name:": "Nom :",
67
+  "Email Adress:": "Adresse mail :"
68
 }
68
 }

+ 2 - 2
frontend/src/component/Account/Password.jsx View File

19
         <input
19
         <input
20
           className='personaldata__form__txtinput form-control'
20
           className='personaldata__form__txtinput form-control'
21
           type='password'
21
           type='password'
22
-          placeholder={props.inputPlaceholderOldPassword}
22
+          placeholder={props.t('Old password')}
23
         />
23
         />
24
         <input
24
         <input
25
           className='personaldata__form__txtinput form-control mt-4'
25
           className='personaldata__form__txtinput form-control mt-4'
26
           type='password'
26
           type='password'
27
-          placeholder={props.inputPlaceholderNewPassword}
27
+          placeholder={props.t('New password')}
28
         />
28
         />
29
         <button type='submit' className='personaldata__form__button btn btn-outline-primary mt-4'>
29
         <button type='submit' className='personaldata__form__button btn btn-outline-primary mt-4'>
30
           {props.t('Send')}
30
           {props.t('Send')}

+ 4 - 4
frontend/src/component/Account/PersonalData.jsx View File

15
 
15
 
16
       <form className='personaldata__form'>
16
       <form className='personaldata__form'>
17
         <div className='personaldata__form__title'>
17
         <div className='personaldata__form__title'>
18
-          {props.t('Name :')}
18
+          {props.t('Name:')}
19
         </div>
19
         </div>
20
         <div className='d-flex align-items-center justify-content-between flex-wrap mb-4'>
20
         <div className='d-flex align-items-center justify-content-between flex-wrap mb-4'>
21
           <input
21
           <input
22
             className='personaldata__form__txtinput form-control mt-3 mt-sm-0'
22
             className='personaldata__form__txtinput form-control mt-3 mt-sm-0'
23
             type='text'
23
             type='text'
24
-            placeholder={props.inputPlaceholderNameUser}
24
+            placeholder={props.t('Change your name')}
25
           />
25
           />
26
         </div>
26
         </div>
27
         <div className='personaldata__form__title'>
27
         <div className='personaldata__form__title'>
28
-          {props.t('Email Adress :')}
28
+          {props.t('Email Adress:')}
29
         </div>
29
         </div>
30
         <div className='d-flex align-items-center justify-content-between flex-wrap mb-4'>
30
         <div className='d-flex align-items-center justify-content-between flex-wrap mb-4'>
31
           <input
31
           <input
32
             className='personaldata__form__txtinput form-control mt-3 mt-sm-0'
32
             className='personaldata__form__txtinput form-control mt-3 mt-sm-0'
33
             type='email'
33
             type='email'
34
-            placeholder={props.inputPlaceholderEmailUser}
34
+            placeholder={props.t('Change your email')}
35
           />
35
           />
36
         </div>
36
         </div>
37
         <button type='submit' className='personaldata__form__button btn btn-outline-primary'>
37
         <button type='submit' className='personaldata__form__button btn btn-outline-primary'>

+ 1 - 5
frontend/src/container/Account.jsx View File

81
       switch (this.state.subComponentMenu.find(({active}) => active).name) {
81
       switch (this.state.subComponentMenu.find(({active}) => active).name) {
82
         case 'personalData':
82
         case 'personalData':
83
           return <PersonalData
83
           return <PersonalData
84
-            inputPlaceholderNameUser={this.props.t('Change your name')}
85
-            inputPlaceholderEmailUser={this.props.t('Change your email')}
86
           />
84
           />
87
 
85
 
88
         // case 'calendar':
86
         // case 'calendar':
96
 
94
 
97
         case 'password':
95
         case 'password':
98
           return <Password
96
           return <Password
99
-            inputPlaceholderOldPassword={this.props.t('Old Password')}
100
-            inputPlaceholderNewPassword={this.props.t('New Password')}
101
           />
97
           />
102
 
98
 
103
         case 'timezone':
99
         case 'timezone':
136
 }
132
 }
137
 
133
 
138
 const mapStateToProps = ({ user, workspaceList, timezone }) => ({ user, workspaceList, timezone })
134
 const mapStateToProps = ({ user, workspaceList, timezone }) => ({ user, workspaceList, timezone })
139
-export default translate()(connect(mapStateToProps)(Account))
135
+export default connect(mapStateToProps)(translate()(Account))

+ 1 - 1
frontend/src/container/Dashboard.jsx View File

600
 }
600
 }
601
 
601
 
602
 const mapStateToProps = ({ user, app, contentType, workspaceList }) => ({ user, app, contentType, workspaceList })
602
 const mapStateToProps = ({ user, app, contentType, workspaceList }) => ({ user, app, contentType, workspaceList })
603
-export default translate()(connect(mapStateToProps)(Dashboard))
603
+export default connect(mapStateToProps)(translate()(Dashboard))