From b4d0f69a809405eb32e253529bac36f86418e9e4 Mon Sep 17 00:00:00 2001
From: Echo <ChaosExAnima@users.noreply.github.com>
Date: Mon, 21 Sep 2026 14:39:00 +0000
Subject: [PATCH] Status redesign: Update visibility display (#40633)

---
 .../mastodon/components/status/header.tsx       | 17 ++++++++++++++---
 app/javascript/mastodon/locales/en.json         |  3 ++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/components/status/header.tsx b/app/javascript/mastodon/components/status/header.tsx
index ca534c3e33b..cfa5b360ce3 100644
--- a/app/javascript/mastodon/components/status/header.tsx
+++ b/app/javascript/mastodon/components/status/header.tsx
@@ -19,7 +19,7 @@ import { statusLink } from './utils';
 interface StatusRedesignHeaderProps {
   status: Pick<
     AccountStatusShape,
-    'id' | 'account' | 'created_at' | 'visibility'
+    'id' | 'account' | 'created_at' | 'visibility' | 'mentions'
   >;
   children?: React.ReactNode;
   className?: string;
@@ -58,9 +58,20 @@ export const StatusRedesignHeader: React.FC<StatusRedesignHeaderProps> = ({
     displayName = (
       <FormattedMessage
         id='status.header.to_followers'
-        defaultMessage='{displayName} to Followers'
+        defaultMessage='{author} to Followers {count, plural, =0 {} one {+ # other} other {+ # others}}'
+        description='Count is # of other people mentioned in the post'
         tagName='span'
-        values={{ displayName }}
+        values={{ author: displayName, count: status.mentions.length }}
+      />
+    );
+  } else if (status.visibility === 'direct') {
+    displayName = (
+      <FormattedMessage
+        id='status.header.message_to_me'
+        defaultMessage='{author} to You {count, plural, =0 {} one {+ # other} other {+ # others}}'
+        description='DisplayName is the author, count is # of other people mentioned in the post'
+        tagName='span'
+        values={{ author: displayName, count: status.mentions.length - 1 }}
       />
     );
   }
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 6e920eae98f..a41f5ea1957 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -1390,7 +1390,8 @@
   "status.favourite": "Favorite",
   "status.favourites_count": "{count, plural, one {{counter} favorite} other {{counter} favorites}}",
   "status.filter": "Filter this post",
-  "status.header.to_followers": "{displayName} to Followers",
+  "status.header.message_to_me": "{author} to You {count, plural, =0 {} one {+ # other} other {+ # others}}",
+  "status.header.to_followers": "{author} to Followers {count, plural, =0 {} one {+ # other} other {+ # others}}",
   "status.history.created": "{name} created {date}",
   "status.history.edited": "{name} edited {date}",
   "status.likes_count": "{count, plural, one {{counter} like} other {{counter} likes}}",