jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conversation details label: Differentiate between group and 1:1 chat 

Co-authored-by: Scott Nonnenberg <scott@signal.org>
This commit is contained in:
automated-signal 2021-11-20 08:41:57 -08:00 committed by GitHub
parent a67c02686b
commit ccf0100906
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
_locales/en/messages.json
View File

@ -5404,9 +5404,13 @@
"message": "Disappearing messages", "message": "Disappearing messages",
"description": "This is the label for the disappearing messages setting panel" "description": "This is the label for the disappearing messages setting panel"
}, },
"ConversationDetails--disappearing-messages-info": { "ConversationDetails--disappearing-messages-info--group": {
"message": "When enabled, messages sent and received in this group will disappear after they've been seen.", "message": "When enabled, messages sent and received in this group will disappear after they've been seen.",
"description": "This is the info about the disappearing messages setting" "description": "This is the info about the disappearing messages setting, in groups"
},
"ConversationDetails--disappearing-messages-info--direct": {
"message": "When enabled, messages sent and received in this 1:1 chat will disappear after they've been seen.",
"description": "This is the info about the disappearing messages setting, for direct conversations"
}, },
"ConversationDetails--notifications": { "ConversationDetails--notifications": {
"message": "Notifications", "message": "Notifications",

6
ts/components/conversation/conversation-details/ConversationDetails.tsx
View File

@ -391,7 +391,11 @@ export const ConversationDetails: React.ComponentType<Props> = ({
icon={IconType.timer} icon={IconType.timer}
/> />
} }
info={i18n('ConversationDetails--disappearing-messages-info')} info={i18n(
isGroup
? 'ConversationDetails--disappearing-messages-info--group'
: 'ConversationDetails--disappearing-messages-info--direct'
)}
label={i18n('ConversationDetails--disappearing-messages-label')} label={i18n('ConversationDetails--disappearing-messages-label')}
right={ right={
<DisappearingTimerSelect <DisappearingTimerSelect