hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix account redirect confirmation message talking about moved followers (#13950) 

Fixes #13949
signup-info-prompt
ThibG 2020-06-03 20:18:19 +02:00 committed by GitHub
parent 643065799b
commit bf94934623
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/settings/migration/redirects_controller.rb
View File

@ -18,7 +18,7 @@ class Settings::Migration::RedirectsController < Settings::BaseController
if @redirect.valid_with_challenge?(current_user) if @redirect.valid_with_challenge?(current_user)
current_account.update!(moved_to_account: @redirect.target_account) current_account.update!(moved_to_account: @redirect.target_account)
ActivityPub::UpdateDistributionWorker.perform_async(current_account.id) ActivityPub::UpdateDistributionWorker.perform_async(current_account.id)
redirect_to settings_migration_path, notice: I18n.t('migrations.moved_msg', acct: current_account.moved_to_account.acct) redirect_to settings_migration_path, notice: I18n.t('migrations.redirected_msg', acct: current_account.moved_to_account.acct)
else else
render :new render :new
end end

1
config/locales/en.yml
View File

@ -922,6 +922,7 @@ en:
on_cooldown: You have recently migrated your account. This function will become available again in %{count} days. on_cooldown: You have recently migrated your account. This function will become available again in %{count} days.
past_migrations: Past migrations past_migrations: Past migrations
proceed_with_move: Move followers proceed_with_move: Move followers
redirected_msg: Your account is now redirecting to %{acct}.
redirecting_to: Your account is redirecting to %{acct}. redirecting_to: Your account is redirecting to %{acct}.
set_redirect: Set redirect set_redirect: Set redirect
warning: warning: