From 47d76179227bc2999eefa1cd6221dc073835937b Mon Sep 17 00:00:00 2001
From: diondiondion <mail@diondiondion.com>
Date: Thu, 24 Sep 2026 13:17:16 +0000
Subject: [PATCH] Redesign: Rename remaining instances of "direct mentions" to
 "messages" (#40684)

---
 .../features/direct_timeline/index.tsx        | 30 ++++++++++++++-----
 .../components/policy_controls.tsx            | 16 +++++++---
 app/javascript/mastodon/locales/en.json       |  3 ++
 3 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/app/javascript/mastodon/features/direct_timeline/index.tsx b/app/javascript/mastodon/features/direct_timeline/index.tsx
index 1b8b05edd57..aae203ca663 100644
--- a/app/javascript/mastodon/features/direct_timeline/index.tsx
+++ b/app/javascript/mastodon/features/direct_timeline/index.tsx
@@ -123,19 +123,33 @@ const DirectTimeline: React.FC<ColumnBase> = ({ columnId, multiColumn }) => {
         trackScroll={!pinned}
         scrollKey={`direct_timeline-${columnId}`}
         emptyMessage={
-          <FormattedMessage
-            id='empty_column.direct'
-            defaultMessage="You don't have any private mentions yet. When you send or receive one, it will show up here."
-          />
+          isRedesignEnabled() ? (
+            <FormattedMessage
+              id='empty_column.messages'
+              defaultMessage="You don't have any messages yet. When you send or receive one, it will show up here."
+            />
+          ) : (
+            <FormattedMessage
+              id='empty_column.direct'
+              defaultMessage="You don't have any private mentions yet. When you send or receive one, it will show up here."
+            />
+          )
         }
         bindToDocument={!multiColumn}
         prepend={
           <div className='follow_requests-unlocked_explanation'>
             <span>
-              <FormattedMessage
-                id='compose_form.encryption_warning'
-                defaultMessage='Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.'
-              />{' '}
+              {isRedesignEnabled() ? (
+                <FormattedMessage
+                  id='compose_form.encryption_warning_messages'
+                  defaultMessage='Messages on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.'
+                />
+              ) : (
+                <FormattedMessage
+                  id='compose_form.encryption_warning'
+                  defaultMessage='Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.'
+                />
+              )}{' '}
               <a
                 href='https://docs.joinmastodon.org/user/posting/#private'
                 rel='noreferrer'
diff --git a/app/javascript/mastodon/features/notifications/components/policy_controls.tsx b/app/javascript/mastodon/features/notifications/components/policy_controls.tsx
index 03fb3530ca7..07660e81539 100644
--- a/app/javascript/mastodon/features/notifications/components/policy_controls.tsx
+++ b/app/javascript/mastodon/features/notifications/components/policy_controls.tsx
@@ -2,6 +2,7 @@ import { useCallback } from 'react';
 
 import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 
+import { isRedesignEnabled } from '@/mastodon/utils/environment';
 import { openModal } from 'mastodon/actions/modal';
 import { updateNotificationsPolicy } from 'mastodon/actions/notification_policies';
 import type { AppDispatch } from 'mastodon/store';
@@ -186,10 +187,17 @@ export const PolicyControls: React.FC = () => {
           onChange={handleFilterPrivateMentions}
           options={options}
           label={
-            <FormattedMessage
-              id='notifications.policy.filter_private_mentions_title'
-              defaultMessage='Unsolicited private mentions'
-            />
+            isRedesignEnabled() ? (
+              <FormattedMessage
+                id='notifications.policy.filter_private_mentions_title'
+                defaultMessage='Unsolicited private mentions'
+              />
+            ) : (
+              <FormattedMessage
+                id='notifications.policy.filter_messages'
+                defaultMessage='Unsolicited messages'
+              />
+            )
           }
           hint={
             <FormattedMessage
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 13213d80c59..34b6bd94948 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -597,6 +597,7 @@
   "compose.visibility.to_reply": "Reply publicly instead",
   "compose_form.direct_message_warning_learn_more": "Learn more",
   "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any sensitive information over Mastodon.",
+  "compose_form.encryption_warning_messages": "Messages on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is not public. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
@@ -792,6 +793,7 @@
   "empty_column.liked_posts": "You don't have any liked posts yet. When you like one, it will show up here.",
   "empty_column.likes": "No one has liked this post yet. When someone does, they will show up here.",
   "empty_column.list": "There is nothing in this list yet. When members of this list publish new posts, they will appear here.",
+  "empty_column.messages": "You don't have any messages yet. When you send or receive one, it will show up here.",
   "empty_column.mutes": "You haven't muted any users yet.",
   "empty_column.notification_requests": "All clear! There is nothing here. When you receive new notifications, they will appear here according to your settings.",
   "empty_column.notifications": "You don't have any notifications yet. When other people interact with you, you will see it here.",
@@ -1194,6 +1196,7 @@
   "notifications.policy.filter_hint": "Send to filtered notifications inbox",
   "notifications.policy.filter_limited_accounts_hint": "Limited by server moderators",
   "notifications.policy.filter_limited_accounts_title": "Moderated accounts",
+  "notifications.policy.filter_messages": "Unsolicited messages",
   "notifications.policy.filter_new_accounts.hint": "Created within the past {days, plural, one {one day} other {# days}}",
   "notifications.policy.filter_new_accounts_title": "New accounts",
   "notifications.policy.filter_not_followers_hint": "Including people who have been following you fewer than {days, plural, one {one day} other {# days}}",