replace unsend with deleteForEveryone

pull/1306/head
Audric Ackermann 5 years ago
parent edf25e8cbc
commit 66d3a2b86c
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4

@ -809,14 +809,11 @@
"delete": {
"message": "Delete"
},
"unsend": {
"message": "Unsend"
},
"deletePublicWarning": {
"message": "Are you sure? Clicking 'unsend' will permanently remove this message for everyone in this channel."
"message": "Are you sure? This will permanently remove this message for everyone in this open group."
},
"deleteMultiplePublicWarning": {
"message": "Are you sure? Clicking 'unsend' will permanently remove these messages for everyone in this channel."
"message": "Are you sure? This will permanently remove these messages for everyone in this open group."
},
"deleteWarning": {
"message": "Are you sure? Clicking 'delete' will permanently remove this message from this device only."
@ -910,7 +907,18 @@
"message": "Delete Messages",
"description": "Menu item for deleting messages, title case."
},
"deleteMessagesForEveryone": {
"message": "Delete messages for everyone",
"description": "Menu item for deleting messages, title case."
},
"deleteMessageForEveryone": {
"message": "Delete message for everyone",
"description": "Menu item for deleting messages, title case."
},
"deleteForEveryone": {
"message": "Delete for everyone",
"description": "Menu item for deleting messages, title case."
},
"deletePublicConversationConfirmation": {
"message": "Permanently delete the messages locally from this public channel?",
"description": "Confirmation dialog text that asks the user if they really wish to delete the public channel messages locally. Answer buttons use the strings 'ok' and 'cancel'. The deletion is permanent, i.e. it cannot be undone."

@ -2396,7 +2396,9 @@
let params;
if (this.isPublic()) {
throw new Error('Called deleteMessages() on an open group. Only leave group is supported.')
throw new Error(
'Called deleteMessages() on an open group. Only leave group is supported.'
);
} else {
params = {
title: i18n('deleteMessages'),

@ -1374,12 +1374,16 @@
// If removable from server, we "Unsend" - otherwise "Delete"
let title;
if (isPublic) {
title = multiple ? i18n('unsendMessages') : i18n('unsendMessage');
title = multiple
? i18n('deleteMessagesForEveryone')
: i18n('deleteMessageForEveryone');
} else {
title = multiple ? i18n('deleteMessages') : i18n('deleteMessage');
}
const okText = isServerDeletable ? i18n('unsend') : i18n('delete');
const okText = isServerDeletable
? i18n('deleteForEveryone')
: i18n('delete');
window.confirmationDialog({
title,

@ -368,7 +368,7 @@ export class ConversationHeader extends React.Component<Props> {
const isServerDeletable = isPublic;
const deleteMessageButtonText = i18n(
isServerDeletable ? 'unsend' : 'delete'
isServerDeletable ? 'deleteForEveryone' : 'delete'
);
return (

@ -926,7 +926,9 @@ export class Message extends React.PureComponent<Props, State> {
};
const isServerDeletable = !!this.props.isPublic;
const deleteMessageCtxText = i18n(isServerDeletable ? 'unsend' : 'delete');
const deleteMessageCtxText = i18n(
isServerDeletable ? 'deleteForEveryone' : 'delete'
);
// CONTEXT MENU "Select Message" does not work

Loading…
Cancel
Save