From dcbd0fc167b44d1c80b6bd2aa8f2971f11eb6896 Mon Sep 17 00:00:00 2001 From: gaba Date: Thu, 1 Jun 2017 17:13:55 -0700 Subject: [PATCH 1/4] Change signed in for logged in. --- plugins/coral-plugin-auth/client/components/UserBox.js | 2 +- plugins/coral-plugin-auth/client/components/styles.css | 4 ++++ plugins/coral-plugin-auth/client/translations.yml | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/coral-plugin-auth/client/components/UserBox.js b/plugins/coral-plugin-auth/client/components/UserBox.js index 91959a35b..47608c0e3 100644 --- a/plugins/coral-plugin-auth/client/components/UserBox.js +++ b/plugins/coral-plugin-auth/client/components/UserBox.js @@ -10,7 +10,7 @@ const UserBox = ({loggedIn, user, logout, onShowProfile}) => ( { loggedIn ? (
- {t('sign_in.logged_in_as')} + {t('sign_in.logged_in_as')} {user.username}. {t('sign_in.not_you')} logout()}> {t('sign_in.logout')} diff --git a/plugins/coral-plugin-auth/client/components/styles.css b/plugins/coral-plugin-auth/client/components/styles.css index d3cd47b87..c8fbf9a30 100644 --- a/plugins/coral-plugin-auth/client/components/styles.css +++ b/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; diff --git a/plugins/coral-plugin-auth/client/translations.yml b/plugins/coral-plugin-auth/client/translations.yml index 488f505d6..bc7f06759 100644 --- a/plugins/coral-plugin-auth/client/translations.yml +++ b/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" From fd1cf8121e465f52cc47a6188041a6e69da66931 Mon Sep 17 00:00:00 2001 From: gaba Date: Thu, 1 Jun 2017 17:21:55 -0700 Subject: [PATCH 2/4] Move start to the left. --- .../src/components/Comment.js | 18 +++++++++--------- locales/en.yml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js index e3f0137b4..48392cc51 100644 --- a/client/coral-embed-stream/src/components/Comment.js +++ b/client/coral-embed-stream/src/components/Comment.js @@ -308,15 +308,6 @@ class Comment extends React.Component { commentId={comment.id} inline /> - {!disableReply && - - setActiveReplyBox(comment.id)} - parentCommentId={parentId || comment.id} - currentUserId={currentUser && currentUser.id} - banned={false} - /> - } + {!disableReply && + + setActiveReplyBox(comment.id)} + parentCommentId={parentId || comment.id} + currentUserId={currentUser && currentUser.id} + banned={false} + /> + }
{ users.length - ?

Because you ignored these, you do not see their comments.

+ ?

{t('framework.because_you_ignored')}

: null }
@@ -29,7 +29,7 @@ export class IgnoredUsers extends Component {
stopIgnoring({id})} - className={styles.link}>Stop ignoring + className={styles.link}>{t('framwork.stop_ignoring')}
)) diff --git a/locales/en.yml b/locales/en.yml index add0275f4..e8e3ba2e9 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -179,6 +179,7 @@ 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 @@ -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" diff --git a/locales/es.yml b/locales/es.yml index d658bcfcf..9e49d8d25 100644 --- a/locales/es.yml +++ b/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" From eadbb03c15afacdfcdfaf1b12ba9f28d38fd7ec3 Mon Sep 17 00:00:00 2001 From: gaba Date: Fri, 2 Jun 2017 06:54:01 -0700 Subject: [PATCH 4/4] Fix typo. --- client/coral-settings/components/IgnoredUsers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/coral-settings/components/IgnoredUsers.js b/client/coral-settings/components/IgnoredUsers.js index fd00d2860..32e485e4c 100644 --- a/client/coral-settings/components/IgnoredUsers.js +++ b/client/coral-settings/components/IgnoredUsers.js @@ -29,7 +29,7 @@ export class IgnoredUsers extends Component {
stopIgnoring({id})} - className={styles.link}>{t('framwork.stop_ignoring')} + className={styles.link}>{t('framework.stop_ignoring')}
))