Merge branch 'master' into firefox-mod-buttons

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

@@ -157,31 +157,31 @@ class Comment extends React.Component {
         <PubDate created_at={comment.created_at} />
         <Content body={comment.body} />
           <div className="commentActionsLeft comment__action-container">
-              <ActionButton>
-                <LikeButton
-                  like={like}
-                  id={comment.id}
-                  postLike={postLike}
-                  deleteAction={deleteAction}
-                  showSignInDialog={showSignInDialog}
-                  currentUser={currentUser} />
-              </ActionButton>
-              <ActionButton>
-                <ReplyButton
-                  onClick={() => setActiveReplyBox(comment.id)}
-                  parentCommentId={parentId || comment.id}
-                  currentUserId={currentUser && currentUser.id}
-                  banned={false} />
-              </ActionButton>
-              <ActionButton>
-                <IfUserCanModifyBest user={currentUser}>
-                  <BestButton
-                    isBest={commentIsBest(comment)}
-                    addBest={addBestTag}
-                    removeBest={removeBestTag} />
-                </IfUserCanModifyBest>
-              </ActionButton>
-            </div>
+            <ActionButton>
+              <LikeButton
+                like={like}
+                id={comment.id}
+                postLike={postLike}
+                deleteAction={deleteAction}
+                showSignInDialog={showSignInDialog}
+                currentUser={currentUser} />
+            </ActionButton>
+            <ActionButton>
+              <ReplyButton
+                onClick={() => setActiveReplyBox(comment.id)}
+                parentCommentId={parentId || comment.id}
+                currentUserId={currentUser && currentUser.id}
+                banned={false} />
+            </ActionButton>
+            <ActionButton>
+              <IfUserCanModifyBest user={currentUser}>
+                <BestButton
+                  isBest={commentIsBest(comment)}
+                  addBest={addBestTag}
+                  removeBest={removeBestTag} />
+              </IfUserCanModifyBest>
+            </ActionButton>
+          </div>
         <div className="commentActionsRight comment__action-container">
           <ActionButton>
             <PermalinkButton articleURL={asset.url} commentId={comment.id} />

client/coral-framework/translations.json

@@ -5,9 +5,9 @@
     "successNameUpdate": "Your username has been updated",
     "contentNotAvailable": "This content is not available",
     "loadMore": "View more",
-    "bannedAccountMsg": "Your account is currently suspended. This means that you cannot Like, Flag, or write comments. Please contact moderator@fakeurl.com for more information",
+    "bannedAccountMsg": "Your account is currently suspended. This means that you cannot Like, Report, or write comments. Please contact us if you have any questions.",
     "editName": {
-      "msg": "Your account is currently suspended because your username has been deemed inappropriate. To restore your account, please enter a new username. You may contact moderator@fakeurl.com for more information.",
+      "msg": "Your account is currently suspended because your username has been deemed inappropriate. To restore your account, please enter a new username. Please contact us if you have any questions.",
       "label": "New Username",
       "button": "Submit",
       "error": "Usernames can contain letters, numbers and _ only"
@@ -41,7 +41,7 @@
     "successUpdateSettings": "La configuración de este articulo fue actualizada",
     "successBioUpdate": "Tu bio fue actualizada",
     "contentNotAvailable": "El contenido no se encuentra disponible",
-    "bannedAccountMsg": "Tu cuenta se encuentra suspendida. Esto significa que no puedes dar Like, Marcar o escribir commentarios. Por favor, contacta moderator@fakeurl for more information",
+    "bannedAccountMsg": "Tu cuenta se encuentra suspendida. Esto significa que no puedes dar Like, Marcar o escribir commentarios.",
     "editNameMsg": "",
     "loadMore": "Ver más",
     "newCount": "Ver {0} {1} más",

client/coral-plugin-flags/translations.json

@@ -7,8 +7,8 @@
     "step-1-header": "Report an issue",
     "step-2-header": "Help us understand",
     "step-3-header": "Thank you for your input",
-    "flag-username": "Flag username",
-    "flag-comment": "Flag comment",
+    "flag-username": "Report username",
+    "flag-comment": "Report comment",
     "continue": "Continue",
     "done": "Done",
     "no-agree-comment": "I don't agree with this comment",
@@ -20,8 +20,8 @@
     "no-like-bio": "I don't like this bio",
     "marketing": "This looks like an ad/marketing",
     "user-impersonating": "This user is impersonating",
-    "thank-you": "We value your safety and feedback. A moderator will review your flag.",
-    "flag-reason": "Reason for flag (Optional)",
+    "thank-you": "We value your safety and feedback. A moderator will review your report.",
+    "flag-reason": "Reason for reporting (Optional)",
     "other": "Other"
   },
   "es": {