Merge branch 'master' into user-comment-history

client/coral-embed-stream/src/components/Comment.js

@@ -308,15 +308,6 @@ class Comment extends React.Component {
               commentId={comment.id}
               inline
             />
-            {!disableReply &&
-              <ActionButton>
-                <ReplyButton
-                  onClick={() => setActiveReplyBox(comment.id)}
-                  parentCommentId={parentId || comment.id}
-                  currentUserId={currentUser && currentUser.id}
-                  banned={false}
-                />
-              </ActionButton>}
             <ActionButton>
               <IfUserCanModifyBest user={currentUser}>
                 <BestButton
@@ -326,6 +317,15 @@ class Comment extends React.Component {
                 />
               </IfUserCanModifyBest>
             </ActionButton>
+            {!disableReply &&
+              <ActionButton>
+                <ReplyButton
+                  onClick={() => setActiveReplyBox(comment.id)}
+                  parentCommentId={parentId || comment.id}
+                  currentUserId={currentUser && currentUser.id}
+                  banned={false}
+                />
+              </ActionButton>}
             <Slot
               fill="commentActions"
               data={this.props.data}

client/coral-settings/components/IgnoredUsers.js

@@ -1,5 +1,5 @@
 import React, {Component, PropTypes} from 'react';
-
+import t from 'coral-framework/services/i18n';
 import styles from './IgnoredUsers.css';
 
 export class IgnoredUsers extends Component {
@@ -18,7 +18,7 @@ export class IgnoredUsers extends Component {
       <div>
         {
           users.length
-            ? <p>Because you ignored these, you do not see their comments.</p>
+            ? <p>{t('framework.because_you_ignored')}</p>
             : null
         }
         <dl className={styles.ignoredUserList}>
@@ -29,7 +29,7 @@ export class IgnoredUsers extends Component {
                 <dd className={styles.stopListening}>
                   <a
                     onClick={() => stopIgnoring({id})}
-                    className={styles.link}>Stop ignoring</a>
+                    className={styles.link}>{t('framework.stop_ignoring')}</a>
                 </dd>
               </span>
             ))

locales/en.yml

@@ -179,10 +179,11 @@ en:
   flag_username: "Report username"
   framework:
     banned_account_msg: "Your account is currently suspended. This means that you cannot Like Report or write comments. Please contact us if you have any questions."
+    because_you_ignored: "Because you ignored the following commenters, their comments are hidden."
     comment: comment
     comment_is_ignored: "This comment is hidden because you ignored this user."
     comments: comments
-    configure_stream: "Configure Stream"
+    configure_stream: "Configure"
     content_not_available: "This content is not available"
     edit_name:
       button: Submit
@@ -195,6 +196,7 @@ en:
     new_count: "View {0} new {1}"
     profile: Profile
     show_all_comments: "Show all comments"
+    stop_ignoring: "Stop ignoring"
     success_bio_update: "Your biography has been updated"
     success_name_update: "Your username has been updated"
     success_update_settings: "The changes you have made have been applied to the comment stream on this article"

locales/es.yml

@@ -217,6 +217,7 @@ es:
   framework:
     banned_account_msg: "Tu cuenta se encuentra suspendida. Esto significa que no\
       \ puedes gustar, marcar o escribir comentarios."
+    because_you_ignored: "Porque has ignorado a los siguientes comentadores, sus comentarios estan escondidos."
     comment: comentario
     comment_is_ignored: "Este comentario está escondido porque has ignorado al usuario."
     comments: comentarios
@@ -235,6 +236,7 @@ es:
     new_count: "Ver {0} {1} nuevo"
     profile: Perfil
     show_all_comments: "Mostrar todos los comentarios"
+    stop_ignoring: "No ignorar más"
     success_bio_update: "Tu biografia fue actualizada"
     success_name_update: "Tu nombre de usuario ha sido actualizado"
     success_update_settings: "La configuración de este articulo fue actualizada"

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"