From 2778eeffbaf86747c1da84929bdd9acb4adca814 Mon Sep 17 00:00:00 2001 From: Claire Date: Fri, 5 Jun 2026 16:24:42 +0200 Subject: [PATCH] =?UTF-8?q?Add=20link=20to=20profile=20editing=20from=20?= =?UTF-8?q?=E2=80=9CPrivacy=20and=20reach=E2=80=9D=20(#39309)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/javascript/styles/mastodon/admin.scss | 2 ++ app/views/settings/privacy/show.html.haml | 8 ++++++++ config/locales/en.yml | 1 + 3 files changed, 11 insertions(+) diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index 0abcefaa4b..836c5c60ca 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -487,6 +487,8 @@ $content-width: 840px; .title { font-weight: 600; margin-bottom: 8px; + font-size: inherit; + line-height: inherit; } a { diff --git a/app/views/settings/privacy/show.html.haml b/app/views/settings/privacy/show.html.haml index 67026a62e8..6de1bdfca8 100644 --- a/app/views/settings/privacy/show.html.haml +++ b/app/views/settings/privacy/show.html.haml @@ -38,6 +38,14 @@ .fields-group = ff.input :show_application, wrapper: :with_label + %aside.callout + = material_symbol 'info' + .content + .body + %p.title= t('edit_profile.redesign_title') + %p= t('edit_profile.privacy_redesign_body') + = link_to t('edit_profile.redesign_button'), '/profile/edit' + - if Rails.application.config.x.email_subscriptions && Setting.email_subscriptions && current_user.can?(:manage_email_subscriptions) %h2= t('privacy.email_subscriptions') diff --git a/config/locales/en.yml b/config/locales/en.yml index 0ad0c8591a..7bd0568fb9 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1501,6 +1501,7 @@ en: your_appeal_rejected: Your appeal has been rejected edit_profile: other: Other + privacy_redesign_body: The choice to show your follows and followers is now made directly from your profile. redesign_body: Profile editing can now be accessed directly from the profile page. redesign_button: Go there redesign_title: There’s a new profile editing experience