mirror of https://github.com/mastodon/mastodon.git
Fix account redirect confirmation message talking about moved followers (#13950)
Fixes #13949pull/13984/head
parent
643065799b
commit
bf94934623
|
@ -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
|
||||||
|
|
|
@ -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:
|
||||||
|
|
Loading…
Reference in New Issue