From 8082bd8ff63e7166ebd129719517552fd0be01f5 Mon Sep 17 00:00:00 2001 From: Claire Date: Thu, 24 Sep 2026 17:35:11 +0200 Subject: [PATCH] Update messaging around `disabled?` in moderation interface --- app/views/admin/accounts/_buttons.html.haml | 2 +- app/views/admin/accounts/_counters.html.haml | 4 ++-- config/locales/en.yml | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/views/admin/accounts/_buttons.html.haml b/app/views/admin/accounts/_buttons.html.haml index 5564d272519..fdbc6ac401f 100644 --- a/app/views/admin/accounts/_buttons.html.haml +++ b/app/views/admin/accounts/_buttons.html.haml @@ -18,7 +18,7 @@ - if account.local? && account.user_approved? = link_to t('admin.accounts.warn'), new_admin_account_action_path(account.id, type: 'none'), class: 'button' if can?(:warn, account) - if account.user_disabled? - = link_to t('admin.accounts.enable'), enable_admin_account_path(account.id), method: :post, class: 'button' if can?(:enable, account.user) + = link_to(account.user_confirmed? ? t('admin.accounts.enable') : t('admin.accounts.enable_unconfirmed'), enable_admin_account_path(account.id), method: :post, class: 'button') if can?(:enable, account.user) - elsif can?(:disable, account.user) = link_to t('admin.accounts.disable'), new_admin_account_action_path(account.id, type: 'disable'), class: 'button' - if account.sensitized? diff --git a/app/views/admin/accounts/_counters.html.haml b/app/views/admin/accounts/_counters.html.haml index 94946d54e2b..cb17e0b14ed 100644 --- a/app/views/admin/accounts/_counters.html.haml +++ b/app/views/admin/accounts/_counters.html.haml @@ -30,12 +30,12 @@ = t('admin.accounts.memorialized') - elsif account.silenced? = t('admin.accounts.silenced') + - elsif account.local? && !account.user_approved? + = t('admin.accounts.pending') - elsif account.local? && account.user_disabled? = t('admin.accounts.disabled') - elsif account.local? && !account.user_confirmed? = t('admin.accounts.confirming') - - elsif account.local? && !account.user_approved? - = t('admin.accounts.pending') - elsif account.sensitized? = t('admin.accounts.sensitive') - else diff --git a/config/locales/en.yml b/config/locales/en.yml index e40baa3de7d..0291ed7ad94 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -93,6 +93,7 @@ en: enable: Unfreeze enable_sign_in_token: Enable security code challenge enable_sign_in_token_auth: Enable email token authentication + enable_unconfirmed: Allow confirmation e-mail enabled: Enabled enabled_msg: Successfully unfroze %{username}'s account follow_recommendations: