Note if the user is already following the target when authorizing follow (#6325)

This commit is contained in:
Akihiko Odaki 2018-03-24 20:50:41 +09:00 committed by Eugen Rochko
parent 580835ab69
commit fa310695fa
5 changed files with 14 additions and 5 deletions

View File

@ -0,0 +1,4 @@
.post-follow-actions
%div= link_to t('authorize_follow.post_follow.web'), web_url("accounts/#{@account.id}"), class: 'button button--block'
%div= link_to t('authorize_follow.post_follow.return'), TagManager.instance.url_for(@account), class: 'button button--block'
%div= t('authorize_follow.post_follow.close')

View File

@ -5,7 +5,13 @@
.follow-prompt .follow-prompt
= render 'card', account: @account = render 'card', account: @account
- unless current_account.following?(@account) - if current_account.following?(@account)
.flash-message
%strong
= t('authorize_follow.already_following')
= render 'post_follow_actions'
- else
= form_tag authorize_follow_path, method: :post, class: 'simple_form' do = form_tag authorize_follow_path, method: :post, class: 'simple_form' do
= hidden_field_tag :acct, @account.acct = hidden_field_tag :acct, @account.acct
= button_tag t('authorize_follow.follow'), type: :submit = button_tag t('authorize_follow.follow'), type: :submit

View File

@ -10,7 +10,4 @@
= render 'card', account: @account = render 'card', account: @account
.post-follow-actions = render 'post_follow_actions'
%div= link_to t('authorize_follow.post_follow.web'), web_url("accounts/#{@account.id}"), class: 'button button--block'
%div= link_to t('authorize_follow.post_follow.return'), TagManager.instance.url_for(@account), class: 'button button--block'
%div= t('authorize_follow.post_follow.close')

View File

@ -382,6 +382,7 @@ en:
security: Security security: Security
set_new_password: Set new password set_new_password: Set new password
authorize_follow: authorize_follow:
already_following: You are already following this account
error: Unfortunately, there was an error looking up the remote account error: Unfortunately, there was an error looking up the remote account
follow: Follow follow: Follow
follow_request: 'You have sent a follow request to:' follow_request: 'You have sent a follow request to:'

View File

@ -382,6 +382,7 @@ ja:
security: セキュリティ security: セキュリティ
set_new_password: 新しいパスワード set_new_password: 新しいパスワード
authorize_follow: authorize_follow:
already_following: あなたは既にこのアカウントをフォローしています
error: 残念ながら、リモートアカウント情報の取得中にエラーが発生しました error: 残念ながら、リモートアカウント情報の取得中にエラーが発生しました
follow: フォロー follow: フォロー
follow_request: 'あなたは以下のアカウントにフォローリクエストを送信しました:' follow_request: 'あなたは以下のアカウントにフォローリクエストを送信しました:'