Merge branch 'master' into auth-token-via-config

plugins/coral-plugin-auth/client/components/SignInButton.js

@@ -3,12 +3,13 @@ import {Button} from 'coral-ui';
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import {showSignInDialog} from 'coral-framework/actions/auth';
+import t from 'coral-framework/services/i18n';
 
 const SignInButton = ({loggedIn, showSignInDialog}) => (
   <div>
     {!loggedIn
       ? <Button id="coralSignInButton" onClick={showSignInDialog} full>
-          Sign in to comment
+          {t('sign_in.sign_in_to_comment')}
         </Button>
       : null}
   </div>

plugins/coral-plugin-auth/client/components/UserBox.js

@@ -10,7 +10,7 @@ const UserBox = ({loggedIn, user, logout, onShowProfile}) => (
     {
       loggedIn ? (
         <div className={styles.userBox}>
-          {t('sign_in.logged_in_as')}
+          <span className={styles.userBoxLoggedIn}>{t('sign_in.logged_in_as')}</span>
           <a onClick={onShowProfile}>{user.username}</a>. {t('sign_in.not_you')}
           <a className={styles.logout} onClick={() => logout()}>
             {t('sign_in.logout')}

plugins/coral-plugin-auth/client/components/styles.css

@@ -70,6 +70,10 @@ input.error{
   letter-spacing: 0.1px;
 }
 
+.userBoxLoggedIn {
+  font-weight: bold;
+}
+
 .userBox a {
     color: black;
     font-weight: bold;

plugins/coral-plugin-auth/client/translations.yml

@@ -5,10 +5,10 @@ en:
     verify_email: "Thank you for creating an account! We sent an email to the address you provided to verify your account."
     verify_email2: "You must verify your account before engaging with the community."
     not_you: "Not you?"
-    logged_in_as: "Logged in as"
+    logged_in_as: "Signed in as"
     facebook_sign_in: "Sign in with Facebook"
     facebook_sign_up: "Sign up with Facebook"
-    logout: "Logout"
+    logout: "Sign out"
     sign_in: "Sign in"
     sign_in_to_join: "Sign in to join the conversation"
     or: "Or"