Revert "Change "Follow" to "Follow back" and "Mutual" when appropriat…

…e in web UI (!28452)"

This reverts commit 5976d37.

app/javascript/mastodon/features/account/components/header.jsx

@@ -35,8 +35,6 @@ import FollowRequestNoteContainer from '../containers/follow_request_note_contai
 const messages = defineMessages({
  unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
  follow: { id: 'account.follow', defaultMessage: 'Follow' },
- followBack: { id: 'account.follow_back', defaultMessage: 'Follow back' },
- mutual: { id: 'account.mutual', defaultMessage: 'Mutual' },
  cancel_follow_request: { id: 'account.cancel_follow_request', defaultMessage: 'Withdraw follow request' },
  requested: { id: 'account.requested', defaultMessage: 'Awaiting approval. Click to cancel follow request' },
  unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
@@ -84,18 +82,6 @@ const titleFromAccount = account => {
  return `${prefix} (@${acct})`;
 };
 
-const messageForFollowButton = relationship => {
- if (relationship.get('following') && relationship.get('followed_by')) {
- return messages.mutual;
- } else if (!relationship.get('following') && relationship.get('followed_by')) {
- return messages.followBack;
- } else if (relationship.get('following')) {
- return messages.unfollow;
- } else {
- return messages.follow;
- }
-};
-
 const dateFormatOptions = {
  month: 'short',
  day: 'numeric',
@@ -267,7 +253,9 @@ class Header extends ImmutablePureComponent {
  let info = [];
  let menu = [];
 
- if (me !== account.get('id') && account.getIn(['relationship', 'blocking'])) {
+ if (me !== account.get('id') && account.getIn(['relationship', 'followed_by'])) {
+ info.push(<span key='followed_by' className='relationship-tag'><FormattedMessage id='account.follows_you' defaultMessage='Follows you' /></span>);
+ } else if (me !== account.get('id') && account.getIn(['relationship', 'blocking'])) {
  info.push(<span key='blocked' className='relationship-tag'><FormattedMessage id='account.blocked' defaultMessage='Blocked' /></span>);
  }
 
@@ -293,7 +281,7 @@ class Header extends ImmutablePureComponent {
  } else if (account.getIn(['relationship', 'requested'])) {
  actionBtn = <Button text={intl.formatMessage(messages.cancel_follow_request)} title={intl.formatMessage(messages.requested)} onClick={this.props.onFollow} />;
  } else if (!account.getIn(['relationship', 'blocking'])) {
- actionBtn = <Button disabled={account.getIn(['relationship', 'blocked_by'])} className={classNames({ 'button--destructive': account.getIn(['relationship', 'following']) })} text={intl.formatMessage(messageForFollowButton(account.get('relationship')))} onClick={signedIn ? this.props.onFollow : this.props.onInteractionModal} />;
+ actionBtn = <Button disabled={account.getIn(['relationship', 'blocked_by'])} className={classNames({ 'button--destructive': account.getIn(['relationship', 'following']) })} text={intl.formatMessage(account.getIn(['relationship', 'following']) ? messages.unfollow : messages.follow)} onClick={signedIn ? this.props.onFollow : this.props.onInteractionModal} />;
  } else if (account.getIn(['relationship', 'blocking'])) {
  actionBtn = <Button text={intl.formatMessage(messages.unblock, { name: account.get('username') })} onClick={this.props.onBlock} />;
  }

app/javascript/mastodon/locales/en.json

@@ -32,13 +32,13 @@
  "account.featured_tags.last_status_never": "No posts",
  "account.featured_tags.title": "{name}'s featured hashtags",
  "account.follow": "Follow",
- "account.follow_back": "Follow back",
  "account.followers": "Followers",
  "account.followers.empty": "No one follows this user yet.",
  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
  "account.following": "Following",
  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
  "account.follows.empty": "This user doesn't follow anyone yet.",
+ "account.follows_you": "Follows you",
  "account.go_to_profile": "Go to profile",
  "account.hide_reblogs": "Hide boosts from @{name}",
  "account.in_memoriam": "In Memoriam.",
@@ -53,7 +53,6 @@
  "account.mute_notifications_short": "Mute notifications",
  "account.mute_short": "Mute",
  "account.muted": "Muted",
- "account.mutual": "Mutual",
  "account.no_bio": "No description provided.",
  "account.open_original_page": "Open original page",
  "account.posts": "Posts",