From 8c20376c952f9247eae29ac3ba6654e3fd7fbca1 Mon Sep 17 00:00:00 2001 From: Cristian Date: Mon, 11 Jun 2018 12:34:54 -0300 Subject: [PATCH] Add translations in some missing pages and fix others --- .../coral-admin/src/components/AdminLogin.js | 23 +++++++------- .../src/components/ForgotPassword.js | 8 ++--- client/coral-admin/src/components/Header.js | 4 +-- client/coral-admin/src/components/Login.js | 5 ++-- client/coral-admin/src/components/SignIn.js | 11 +++---- .../routes/Configure/components/EmbedLink.js | 2 +- .../Moderation/components/StorySearch.js | 15 ++++++---- locales/de.yml | 1 - locales/en.yml | 19 ++++++++++-- locales/es.yml | 1 - locales/pt_BR.yml | 30 +++++++++++++++++-- 11 files changed, 82 insertions(+), 37 deletions(-) diff --git a/client/coral-admin/src/components/AdminLogin.js b/client/coral-admin/src/components/AdminLogin.js index 99bd61696..e6bcb3b89 100644 --- a/client/coral-admin/src/components/AdminLogin.js +++ b/client/coral-admin/src/components/AdminLogin.js @@ -5,6 +5,7 @@ import styles from './NotFound.css'; import { Button, TextField, Alert, Success } from 'coral-ui'; import Recaptcha from 'react-recaptcha'; import cn from 'classnames'; +import t from 'coral-framework/services/i18n'; class AdminLogin extends React.Component { constructor(props) { @@ -41,13 +42,13 @@ class AdminLogin extends React.Component { {errorMessage && {errorMessage}} this.setState({ email: e.target.value })} /> this.setState({ password: e.target.value })} type="password" @@ -60,10 +61,10 @@ class AdminLogin extends React.Component { full onClick={this.handleSignIn} > - Sign In + {t('login.sign_in_button')}

- Forgot your password?{' '} + {t('login.forgot_password')}{' '} - Request a new one. + {t('login.request_passowrd')}

{loginMaxExceeded && ( @@ -95,14 +96,14 @@ class AdminLogin extends React.Component { > {this.props.passwordRequestSuccess}{' '} - Sign in + {t('login.sign_in')}

) : (
this.setState({ email: e.target.value })} /> @@ -112,17 +113,15 @@ class AdminLogin extends React.Component { full onClick={this.handleRequestPassword} > - Reset Password + {t('login.reset_password')} ); return (
-

Team sign in

-

- Sign in to interact with your community. -

+

{t('login.team_sign_in')}

+

{t('login.sign_in_message')}

{this.state.requestPassword ? requestPasswordForm : signInForm}
diff --git a/client/coral-admin/src/components/ForgotPassword.js b/client/coral-admin/src/components/ForgotPassword.js index fe08436ae..d2d1dbf4e 100644 --- a/client/coral-admin/src/components/ForgotPassword.js +++ b/client/coral-admin/src/components/ForgotPassword.js @@ -43,21 +43,21 @@ class ForgotPassword extends React.Component {
{errorMessage && {errorMessage}}

- Go back to{' '} + {t('login.go_back')}{' '} - Sign In + {t('login.sign_in')} .

diff --git a/client/coral-admin/src/components/Header.js b/client/coral-admin/src/components/Header.js index f0bb68c0c..fadd33c15 100644 --- a/client/coral-admin/src/components/Header.js +++ b/client/coral-admin/src/components/Header.js @@ -83,7 +83,7 @@ const CoralHeader = ({ target="_blank" rel="noopener noreferrer" > - View latest version + {t('configure.view_last_version')} @@ -92,7 +92,7 @@ const CoralHeader = ({ target="_blank" rel="noopener noreferrer" > - Report a bug or give feedback + {t('configure.report_bug_or_feedback')} {currentUser && ( diff --git a/client/coral-admin/src/components/Login.js b/client/coral-admin/src/components/Login.js index cc5ec9436..2f3f9a975 100644 --- a/client/coral-admin/src/components/Login.js +++ b/client/coral-admin/src/components/Login.js @@ -5,6 +5,7 @@ import PropTypes from 'prop-types'; import styles from './Login.css'; import Layout from 'coral-admin/src/components/Layout'; import cn from 'classnames'; +import t from 'coral-framework/services/i18n'; class LoginContainer extends Component { renderForm() { @@ -19,8 +20,8 @@ class LoginContainer extends Component { return (
-

Team sign in

-

Sign in to interact with your community.

+

{t('login.team_sign_in')}

+

{t('login.sign_in_message')}

{this.renderForm()}
diff --git a/client/coral-admin/src/components/SignIn.js b/client/coral-admin/src/components/SignIn.js index a067ace1d..46d47ecf0 100644 --- a/client/coral-admin/src/components/SignIn.js +++ b/client/coral-admin/src/components/SignIn.js @@ -5,6 +5,7 @@ import { Button, TextField, Alert } from 'coral-ui'; import cn from 'classnames'; import Recaptcha from 'coral-framework/components/Recaptcha'; import External from './External'; +import t from 'coral-framework/services/i18n'; class SignIn extends React.Component { recaptcha = null; @@ -40,13 +41,13 @@ class SignIn extends React.Component { {errorMessage && {errorMessage}} - Sign In + {t('login.sign_in')}

{/* TODO: translate */} - Forgot your password?{' '} + {t('login.forgot_password')}{' '} - Request a new one. + {t('login.request_passowrd')}

diff --git a/client/coral-admin/src/routes/Configure/components/EmbedLink.js b/client/coral-admin/src/routes/Configure/components/EmbedLink.js index f03716e43..4ed50e98e 100644 --- a/client/coral-admin/src/routes/Configure/components/EmbedLink.js +++ b/client/coral-admin/src/routes/Configure/components/EmbedLink.js @@ -34,7 +34,7 @@ class EmbedLink extends Component { `; return ( - +

{t('configure.copy_and_paste')}