From dd098e63b18c590092f215650242559bf1cf7af4 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 10 Nov 2022 22:45:07 -0500 Subject: [PATCH 1/2] Prioritize other data over redirect --- app/views/settings/migrations/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/settings/migrations/show.html.haml b/app/views/settings/migrations/show.html.haml index 1ecf7302a9..f0553a99a9 100644 --- a/app/views/settings/migrations/show.html.haml +++ b/app/views/settings/migrations/show.html.haml @@ -30,8 +30,8 @@ %ul.hint %li.warning-hint= t('migrations.warning.followers') - %li.warning-hint= t('migrations.warning.redirect') %li.warning-hint= t('migrations.warning.other_data') + %li.warning-hint= t('migrations.warning.redirect') %li.warning-hint= t('migrations.warning.backreference_required') %li.warning-hint= t('migrations.warning.cooldown') %li.warning-hint= t('migrations.warning.disabled_account') From eba662d8d2b697e05b29c24bff8abaf8c6648e5a Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 10 Nov 2022 22:47:58 -0500 Subject: [PATCH 2/2] Clarify that posts and accounts to follow will be left behind --- config/locales/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index c50fc074c4..12924c78c3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1244,7 +1244,7 @@ en: disabled_account: Your current account will not be fully usable afterwards. However, you will have access to data export as well as re-activation. followers: This action will move all followers from the current account to the new account only_redirect_html: Alternatively, you can only put up a redirect on your profile. - other_data: No other data will be moved automatically + other_data: No other data will be moved automatically (includes your posts and the list of accounts you follow) redirect: Your current account's profile will be updated with a redirect notice and be excluded from searches moderation: title: Moderation