From bf949346232b3db731675c1342f50d97fd4a7ef8 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Wed, 3 Jun 2020 20:18:19 +0200
Subject: [PATCH] Fix account redirect confirmation message talking about moved
followers (#13950)
Fixes #13949
---
app/controllers/settings/migration/redirects_controller.rb | 2 +-
config/locales/en.yml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/controllers/settings/migration/redirects_controller.rb b/app/controllers/settings/migration/redirects_controller.rb
index 6e5b72ffba..97193ade02 100644
--- a/app/controllers/settings/migration/redirects_controller.rb
+++ b/app/controllers/settings/migration/redirects_controller.rb
@@ -18,7 +18,7 @@ class Settings::Migration::RedirectsController < Settings::BaseController
if @redirect.valid_with_challenge?(current_user)
current_account.update!(moved_to_account: @redirect.target_account)
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
render :new
end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5943dd4f69..be29286f33 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -922,6 +922,7 @@ en:
on_cooldown: You have recently migrated your account. This function will become available again in %{count} days.
past_migrations: Past migrations
proceed_with_move: Move followers
+ redirected_msg: Your account is now redirecting to %{acct}.
redirecting_to: Your account is redirecting to %{acct}.
set_redirect: Set redirect
warning:
--
GitLab