Skip to content

Commit 3fbdca4

Browse files
committed
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 zulip#5728 is open for a related API migration: to use 'direct' instead of 'private' in POST /messages, when supported. Fixes: zulip#5731
1 parent f5b7611 commit 3fbdca4

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

src/account-info/AccountDetailsScreen.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ export default function AccountDetailsScreen(props: Props): Node {
9191
)}
9292
<ZulipButton
9393
style={styles.pmButton}
94-
text={isActive ? 'Send private message' : 'View private messages'}
94+
text={isActive ? 'Send direct message' : 'View direct messages'}
9595
onPress={handleChatPress}
9696
Icon={IconPrivateChat}
9797
/>

src/main/MainTabsScreen.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export default function MainTabsScreen(props: Props): Node {
7474
name="pm-conversations"
7575
component={PmConversationsScreen}
7676
options={{
77-
tabBarLabel: 'Private messages',
77+
tabBarLabel: 'Direct messages',
7878
tabBarIcon: ({ color }) => <IconPeople size={24} color={color} />,
7979
tabBarBadge: unreadPmsCount > 0 ? unreadPmsCount : undefined,
8080
tabBarBadgeStyle: {

src/pm-conversations/PmConversationsScreen.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export default function PmConversationsScreen(props: Props): Node {
6161
secondary
6262
Icon={IconPerson}
6363
style={styles.button}
64-
text="New PM"
64+
text="New DM"
6565
onPress={() => {
6666
setTimeout(() => navigation.push('new-1to1-pm'));
6767
}}
@@ -70,7 +70,7 @@ export default function PmConversationsScreen(props: Props): Node {
7070
secondary
7171
Icon={IconPeople}
7272
style={styles.button}
73-
text="New group PM"
73+
text="New group DM"
7474
onPress={() => {
7575
setTimeout(() => navigation.push('new-group-pm'));
7676
}}

src/settings/SettingsScreen.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export default function SettingsScreen(props: Props): Node {
8282
key: 'conversation-views-only',
8383
title: 'Only in conversation views',
8484
subtitle:
85-
'Messages will be automatically marked as read only when viewing a single topic or private message conversation.',
85+
'Messages will be automatically marked as read only when viewing a single topic or direct message conversation.',
8686
},
8787
]}
8888
onValueChange={value => {

src/sharing/SharingScreen.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export default function SharingScreen(props: Props): Node {
8181
initialParams={params}
8282
options={{
8383
tabBarLabel: ({ color }) => (
84-
<ZulipTextIntl style={[styles.tab, { color }]} text="Private Message" />
84+
<ZulipTextIntl style={[styles.tab, { color }]} text="Direct message" />
8585
),
8686
}}
8787
/>

src/title/TitleSpecial.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import styles from '../styles';
99

1010
const specials = {
1111
home: { name: 'All messages', icon: 'globe' },
12-
private: { name: 'Private messages', icon: 'mail' },
12+
private: { name: 'Direct messages', icon: 'mail' },
1313
starred: { name: 'Starred', icon: 'star' },
1414
mentioned: { name: 'Mentions', icon: 'at-sign' },
1515
};

static/translations/messages_en.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
"{_}": "{_}",
111111
"Home": "Home",
112112
"All messages": "All messages",
113-
"Private messages": "Private messages",
113+
"Direct messages": "Direct messages",
114114
"Starred": "Starred",
115115
"Mentions": "Mentions",
116116
"Message": "Message",
@@ -240,8 +240,8 @@
240240
"Jot down something": "Jot down something",
241241
"Message {recipient}": "Message {recipient}",
242242
"{username} will not be notified unless you subscribe them to this stream.": "{username} will not be notified unless you subscribe them to this stream.",
243-
"Send private message": "Send private message",
244-
"View private messages": "View private messages",
243+
"Send direct message": "Send direct message",
244+
"View direct messages": "View direct messages",
245245
"(This user has been deactivated)": "(This user has been deactivated)",
246246
"(unknown user)": "(unknown user)",
247247
"Forgot password?": "Forgot password?",
@@ -278,8 +278,8 @@
278278
"Marked {numMessages} messages as unread": "Marked {numMessages} messages as unread",
279279
"Marking messages as unread…": "Marking messages as unread…",
280280
"{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}",
281-
"New group PM": "New group PM",
282-
"New PM": "New PM",
281+
"New group DM": "New group DM",
282+
"New DM": "New DM",
283283
"Share": "Share",
284284
"Star message": "Star message",
285285
"Unstar message": "Unstar message",
@@ -320,7 +320,7 @@
320320
"Public": "Public",
321321
"Notifications": "Notifications",
322322
"Stream": "Stream",
323-
"Private Message": "Private Message",
323+
"Direct message": "Direct message",
324324
"Edit stream": "Edit stream",
325325
"OK": "OK",
326326
"Please share the image from your browser": "Please share the image from your browser",
@@ -333,7 +333,7 @@
333333
"Always": "Always",
334334
"Never": "Never",
335335
"Only in conversation views": "Only in conversation views",
336-
"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.",
336+
"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.",
337337
"Topics": "Topics",
338338
"Add subscribers": "Add subscribers",
339339
"Subscribe": "Subscribe",

0 commit comments

Comments
 (0)