Commit f8bd9721 authored by Matija Obreza's avatar Matija Obreza
Browse files

Translations updated

parent e9bbf8a1
{
"appName": "GRIN-Global CE"
"appName": "GRIN-Global CE",
"validations": {
"required": "Required"
}
}
\ No newline at end of file
{
"action": {
"back": "Back",
"login": "Login",
"logout": "Logout",
"submit": "Submit"
},
......
{
"appName": "GRIN-Global CE"
"appName": "GRIN-Global CE",
"validations": {
"required": "Required"
}
}
export const required = (value, allValues, meta) => !value ? 'client:validate.error.required' : undefined;
export const required = (value, allValues, meta) => !value ? 'client:validations.required' : undefined;
......@@ -15,7 +15,15 @@
"public": {
"p": {
"login": {
"youLoggedIn": "You logged in as {{username}}"
"loggedIn": "You are logged in as {{username}}",
"username": {
"label": "Username",
"placeholder": "Your GG-CE username"
},
"password": {
"label": "Password",
"placeholder": "Your password"
}
}
}
},
......
......@@ -2,7 +2,15 @@
"public": {
"p": {
"login": {
"youLoggedIn": "You logged in as {{username}}"
"loggedIn": "You are logged in as {{username}}",
"username": {
"label": "Username",
"placeholder": "Your GG-CE username"
},
"password": {
"label": "Password",
"placeholder": "Your password"
}
}
}
},
......
......@@ -44,7 +44,7 @@ class UserDetailsPage extends React.Component<ILoginPageProps> {
) : (
<span>
<div>
{ t('public.user.p.login.youLoggedIn', { username: login.user_name })}
<p>{ t('user.public.p.login.loggedIn', { username: login.user_name })}</p>
<button onClick={ this.logout }>{ t('common:action.logout') }</button>
</div>
<BackButton/>
......
......@@ -22,20 +22,22 @@ class LoginFormInternal extends React.Component<any> {
return (
<form onSubmit={ handleSubmit }>
<Field
placeholder={ t('user.public.form.login.label.username') }
label={ t('user.public.p.login.username.label') }
placeholder={ t('user.public.p.login.username.placeholder') }
name="username"
type="text"
validate={ Validators.required }
component={ TextField }
/>
<Field
placeholder={ t('user.public.form.login.label.password') }
label={ t('user.public.p.login.password.label') }
placeholder={ t('user.public.p.login.password.placeholder') }
name="password"
type="password"
validate={ Validators.required }
component={ TextField }
/>
<Button variant="contained" className="float-right" type="submit">{t('common:action.submit')}</Button>
<Button variant="contained" className="float-right" type="submit">{t('common:action.login')}</Button>
</form>
);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment