From 63a917b25b774962a7b81f32e35cc3d6c9f296b3 Mon Sep 17 00:00:00 2001 From: Chris Bobbe Date: Mon, 22 May 2023 23:23:27 -0700 Subject: [PATCH] ui: Rename "private messages" / "PMs" to "direct messages" / "DMs", etc. As mentioned in the issue, there are various variable names that still use "private messages"; we're leaving those be for now. PR #5728 is open for a related API migration: to use 'direct' instead of 'private' in POST /messages, when supported. Fixes: #5731 --- src/account-info/AccountDetailsScreen.js | 2 +- src/main/MainTabsScreen.js | 2 +- src/pm-conversations/PmConversationsScreen.js | 4 ++-- src/settings/SettingsScreen.js | 2 +- src/sharing/SharingScreen.js | 2 +- src/title/TitleSpecial.js | 2 +- static/translations/messages_en.json | 14 +++++++------- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/account-info/AccountDetailsScreen.js b/src/account-info/AccountDetailsScreen.js index f73fcfafca7..9c9af561c76 100644 --- a/src/account-info/AccountDetailsScreen.js +++ b/src/account-info/AccountDetailsScreen.js @@ -91,7 +91,7 @@ export default function AccountDetailsScreen(props: Props): Node { )} diff --git a/src/main/MainTabsScreen.js b/src/main/MainTabsScreen.js index c30f9542a63..cb8ccb85b9f 100644 --- a/src/main/MainTabsScreen.js +++ b/src/main/MainTabsScreen.js @@ -74,7 +74,7 @@ export default function MainTabsScreen(props: Props): Node { name="pm-conversations" component={PmConversationsScreen} options={{ - tabBarLabel: 'Private messages', + tabBarLabel: 'Direct messages', tabBarIcon: ({ color }) => , tabBarBadge: unreadPmsCount > 0 ? unreadPmsCount : undefined, tabBarBadgeStyle: { diff --git a/src/pm-conversations/PmConversationsScreen.js b/src/pm-conversations/PmConversationsScreen.js index ca89c48c778..d8c6ca61a70 100644 --- a/src/pm-conversations/PmConversationsScreen.js +++ b/src/pm-conversations/PmConversationsScreen.js @@ -61,7 +61,7 @@ export default function PmConversationsScreen(props: Props): Node { secondary Icon={IconPerson} style={styles.button} - text="New PM" + text="New DM" onPress={() => { setTimeout(() => navigation.push('new-1to1-pm')); }} @@ -70,7 +70,7 @@ export default function PmConversationsScreen(props: Props): Node { secondary Icon={IconPeople} style={styles.button} - text="New group PM" + text="New group DM" onPress={() => { setTimeout(() => navigation.push('new-group-pm')); }} diff --git a/src/settings/SettingsScreen.js b/src/settings/SettingsScreen.js index 2666233ec27..9a59ebb89bc 100644 --- a/src/settings/SettingsScreen.js +++ b/src/settings/SettingsScreen.js @@ -82,7 +82,7 @@ export default function SettingsScreen(props: Props): Node { key: 'conversation-views-only', title: 'Only in conversation views', subtitle: - 'Messages will be automatically marked as read only when viewing a single topic or private message conversation.', + 'Messages will be automatically marked as read only when viewing a single topic or direct message conversation.', }, ]} onValueChange={value => { diff --git a/src/sharing/SharingScreen.js b/src/sharing/SharingScreen.js index 696c73e380b..b07dfdcab09 100644 --- a/src/sharing/SharingScreen.js +++ b/src/sharing/SharingScreen.js @@ -81,7 +81,7 @@ export default function SharingScreen(props: Props): Node { initialParams={params} options={{ tabBarLabel: ({ color }) => ( - + ), }} /> diff --git a/src/title/TitleSpecial.js b/src/title/TitleSpecial.js index 6dbcb8bf455..8fb8ea5a16c 100644 --- a/src/title/TitleSpecial.js +++ b/src/title/TitleSpecial.js @@ -9,7 +9,7 @@ import styles from '../styles'; const specials = { home: { name: 'All messages', icon: 'globe' }, - private: { name: 'Private messages', icon: 'mail' }, + private: { name: 'Direct messages', icon: 'mail' }, starred: { name: 'Starred', icon: 'star' }, mentioned: { name: 'Mentions', icon: 'at-sign' }, }; diff --git a/static/translations/messages_en.json b/static/translations/messages_en.json index 164fd4fc025..443b654afb8 100644 --- a/static/translations/messages_en.json +++ b/static/translations/messages_en.json @@ -110,7 +110,7 @@ "{_}": "{_}", "Home": "Home", "All messages": "All messages", - "Private messages": "Private messages", + "Direct messages": "Direct messages", "Starred": "Starred", "Mentions": "Mentions", "Message": "Message", @@ -240,8 +240,8 @@ "Jot down something": "Jot down something", "Message {recipient}": "Message {recipient}", "{username} will not be notified unless you subscribe them to this stream.": "{username} will not be notified unless you subscribe them to this stream.", - "Send private message": "Send private message", - "View private messages": "View private messages", + "Send direct message": "Send direct message", + "View direct messages": "View direct messages", "(This user has been deactivated)": "(This user has been deactivated)", "(unknown user)": "(unknown user)", "Forgot password?": "Forgot password?", @@ -278,8 +278,8 @@ "Marked {numMessages} messages as unread": "Marked {numMessages} messages as unread", "Marking messages as unread…": "Marking messages as unread…", "{unreadCount, plural,\n one {{unreadCount} unread message}\n other {{unreadCount} unread messages}\n}": "{unreadCount, plural,\n one {{unreadCount} unread message}\n other {{unreadCount} unread messages}\n}", - "New group PM": "New group PM", - "New PM": "New PM", + "New group DM": "New group DM", + "New DM": "New DM", "Share": "Share", "Star message": "Star message", "Unstar message": "Unstar message", @@ -320,7 +320,7 @@ "Public": "Public", "Notifications": "Notifications", "Stream": "Stream", - "Private Message": "Private Message", + "Direct message": "Direct message", "Edit stream": "Edit stream", "OK": "OK", "Please share the image from your browser": "Please share the image from your browser", @@ -333,7 +333,7 @@ "Always": "Always", "Never": "Never", "Only in conversation views": "Only in conversation views", - "Messages will be automatically marked as read only when viewing a single topic or private message conversation.": "Messages will be automatically marked as read only when viewing a single topic or private message conversation.", + "Messages will be automatically marked as read only when viewing a single topic or direct message conversation.": "Messages will be automatically marked as read only when viewing a single topic or direct message conversation.", "Topics": "Topics", "Add subscribers": "Add subscribers", "Subscribe": "Subscribe",