Merge branch 'master' into update-readme

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 && <Alert>{errorMessage}</Alert>}
         <TextField
           id="email"
-          label="Email Address"
+          label={t('login.email_address')}
           value={this.state.email}
           onChange={e => this.setState({ email: e.target.value })}
         />
         <TextField
           id="password"
-          label="Password"
+          label={t('login.password')}
           value={this.state.password}
           onChange={e => 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')}
         </Button>
         <p className={styles.forgotPasswordCTA}>
-          Forgot your password?{' '}
+          {t('login.forgot_password')}{' '}
           <a
             href="#"
             className={styles.forgotPasswordLink}
@@ -72,7 +73,7 @@ class AdminLogin extends React.Component {
               this.setState({ requestPassword: true });
             }}
           >
-            Request a new one.
+            {t('login.request_passowrd')}
           </a>
         </p>
         {loginMaxExceeded && (
@@ -95,14 +96,14 @@ class AdminLogin extends React.Component {
       >
         {this.props.passwordRequestSuccess}{' '}
         <a className={styles.signInLink} href="#">
-          Sign in
+          {t('login.sign_in')}
         </a>
         <Success />
       </p>
     ) : (
       <form onSubmit={this.handleRequestPassword}>
         <TextField
-          label="Email Address"
+          label={t('login.email_address')}
           value={this.state.email}
           onChange={e => 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')}
         </Button>
       </form>
     );
     return (
       <Layout fixedDrawer restricted={true}>
         <div className={cn(styles.loginLayout, 'talk-admin-login')}>
-          <h1 className={styles.loginHeader}>Team sign in</h1>
-          <p className={styles.loginCTA}>
-            Sign in to interact with your community.
-          </p>
+          <h1 className={styles.loginHeader}>{t('login.team_sign_in')}</h1>
+          <p className={styles.loginCTA}>{t('login.sign_in_message')}</p>
           {this.state.requestPassword ? requestPasswordForm : signInForm}
         </div>
       </Layout>

client/coral-admin/src/components/ForgotPassword.js

@@ -43,21 +43,21 @@ class ForgotPassword extends React.Component {
       <form onSubmit={this.handleSubmit}>
         {errorMessage && <Alert>{errorMessage}</Alert>}
         <TextField
-          label="Email Address"
+          label={t('login.email_address')}
           value={email}
           onChange={this.handleEmailChange}
         />
         <Button type="submit" cStyle="black" full>
-          Reset Password
+          {t('login.reset_password')}
         </Button>
         <p className={styles.cta}>
-          Go back to{' '}
+          {t('login.go_back')}{' '}
           <a
             href="#"
             className={styles.signInLink}
             onClick={this.handleSignInLink}
           >
-            Sign In
+            {t('login.sign_in')}
           </a>
           .
         </p>

client/coral-admin/src/components/Header.js

@@ -92,7 +92,7 @@ const CoralHeader = ({
                         target="_blank"
                         rel="noopener noreferrer"
                       >
-                        View latest version
+                        {t('configure.view_last_version')}
                       </a>
                     </MenuItem>
                     <MenuItem>
@@ -101,7 +101,7 @@ const CoralHeader = ({
                         target="_blank"
                         rel="noopener noreferrer"
                       >
-                        Report a bug or give feedback
+                        {t('configure.report_bug_or_feedback')}
                       </a>
                     </MenuItem>
                     {currentUser && (

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 (
       <Layout fixedDrawer restricted={true}>
         <div className={cn(styles.layout, 'talk-admin-login')}>
-          <h1 className={styles.header}>Team sign in</h1>
-          <p className={styles.cta}>Sign in to interact with your community.</p>
+          <h1 className={styles.header}>{t('login.team_sign_in')}</h1>
+          <p className={styles.cta}>{t('login.sign_in_message')}</p>
           {this.renderForm()}
         </div>
       </Layout>

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 && <Alert>{errorMessage}</Alert>}
           <TextField
             id="email"
-            label="Email Address"
+            label={t('login.email_address')}
             value={email}
             onChange={this.handleEmailChange}
           />
           <TextField
             id="password"
-            label="Password"
+            label={t('login.password')}
             value={password}
             onChange={this.handlePasswordChange}
             type="password"
@@ -68,17 +69,17 @@ class SignIn extends React.Component {
             cStyle="black"
             full
           >
-            Sign In
+            {t('login.sign_in')}
           </Button>
           <p className={styles.forgotPasswordCTA}>
             {/* TODO: translate */}
-            Forgot your password?{' '}
+            {t('login.forgot_password')}{' '}
             <a
               href="#"
               className={styles.forgotPasswordLink}
               onClick={this.handleForgotPasswordLink}
             >
-              Request a new one.
+              {t('login.request_passowrd')}
             </a>
           </p>
         </form>

client/coral-admin/src/routes/Configure/components/EmbedLink.js

@@ -34,7 +34,7 @@ class EmbedLink extends Component {
     `;
 
     return (
-      <ConfigureCard title={'Embed Comment Stream'}>
+      <ConfigureCard title={t('configure.embed_comment_stream')}>
         <p>{t('configure.copy_and_paste')}</p>
         <textarea
           rows={5}

client/coral-admin/src/routes/Moderation/components/StorySearch.js

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import styles from './StorySearch.css';
 import { Button, Spinner, Icon } from 'coral-ui';
 import Story from './Story';
+import t from 'coral-framework/services/i18n';
 
 const StorySearch = props => {
   const {
@@ -36,14 +37,14 @@ const StorySearch = props => {
               onClick={props.search}
               raised
             >
-              Search
+              {t('streams.search')}
             </Button>
           </div>
           <div className={styles.results}>
             {props.assetId && (
               <div className={styles.cta}>
                 <a onClick={props.goToModerateAll}>
-                  Moderate comments on All Stories
+                  {t('moderate_all_streams')}
                 </a>
               </div>
             )}
@@ -51,13 +52,15 @@ const StorySearch = props => {
               {props.moderation.storySearchString ? (
                 <div className={styles.searchResults}>
                   <Icon name="search" />
-                  <span className={styles.headlineRecent}>Search Results</span>
+                  <span className={styles.headlineRecent}>
+                    {t('streams.search_results')}
+                  </span>
                 </div>
               ) : (
                 <div className={styles.searchResults}>
                   <Icon name="access_time" />
                   <span className={styles.headlineRecent}>
-                    Most Recent Stories
+                    {t('streams.most_recent_stories')}
                   </span>
                 </div>
               )}
@@ -85,7 +88,9 @@ const StorySearch = props => {
               )}
 
               {assets.nodes.length === 0 && (
-                <div className={styles.noResults}>No results</div>
+                <div className={styles.noResults}>
+                  {t('streams.search_results')}
+                </div>
               )}
             </div>
           </div>