Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ui: Rename "private messages" / "PMs" to "direct messages" / "DMs", etc. #5735

Merged
merged 1 commit into from
May 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/account-info/AccountDetailsScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export default function AccountDetailsScreen(props: Props): Node {
)}
<ZulipButton
style={styles.pmButton}
text={isActive ? 'Send private message' : 'View private messages'}
text={isActive ? 'Send direct message' : 'View direct messages'}
onPress={handleChatPress}
Icon={IconPrivateChat}
/>
Expand Down
2 changes: 1 addition & 1 deletion src/main/MainTabsScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 }) => <IconPeople size={24} color={color} />,
tabBarBadge: unreadPmsCount > 0 ? unreadPmsCount : undefined,
tabBarBadgeStyle: {
Expand Down
4 changes: 2 additions & 2 deletions src/pm-conversations/PmConversationsScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
}}
Expand All @@ -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'));
}}
Expand Down
2 changes: 1 addition & 1 deletion src/settings/SettingsScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand Down
2 changes: 1 addition & 1 deletion src/sharing/SharingScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export default function SharingScreen(props: Props): Node {
initialParams={params}
options={{
tabBarLabel: ({ color }) => (
<ZulipTextIntl style={[styles.tab, { color }]} text="Private Message" />
<ZulipTextIntl style={[styles.tab, { color }]} text="Direct message" />
),
}}
/>
Expand Down
2 changes: 1 addition & 1 deletion src/title/TitleSpecial.js
Original file line number Diff line number Diff line change
Expand Up @@ -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' },
};
Expand Down
14 changes: 7 additions & 7 deletions static/translations/messages_en.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
"{_}": "{_}",
"Home": "Home",
"All messages": "All messages",
"Private messages": "Private messages",
"Direct messages": "Direct messages",
"Starred": "Starred",
"Mentions": "Mentions",
"Message": "Message",
Expand Down Expand Up @@ -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?",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down