Merge pull request #2270 from Bilb/show-count-messages-deleting-dialog

When deleting multiple messages, inform the user of the number
pull/2279/head
Audric Ackermann 4 years ago committed by GitHub
commit 6e2b2d44f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -94,7 +94,7 @@
"messageDeletionForbidden": "You dont have permission to delete others messages", "messageDeletionForbidden": "You dont have permission to delete others messages",
"deleteJustForMe": "Delete just for me", "deleteJustForMe": "Delete just for me",
"deleteForEveryone": "Delete for everyone", "deleteForEveryone": "Delete for everyone",
"deleteMessagesQuestion": "Delete those messages?", "deleteMessagesQuestion": "Delete $count$ messages?",
"deleteMessageQuestion": "Delete this message?", "deleteMessageQuestion": "Delete this message?",
"deleteMessages": "Delete Messages", "deleteMessages": "Delete Messages",
"deleted": "Deleted", "deleted": "Deleted",

@ -91,7 +91,7 @@
.selection-mode { .selection-mode {
.messages-container > *:not(.message-selected) { .messages-container > *:not(.message-selected) {
animation: toShadow $session-transition-duration; animation: toShadow $session-transition-duration;
opacity: 0.40; opacity: 0.4;
} }
} }
} }

@ -336,13 +336,14 @@ export async function deleteMessagesByIdForEveryone(
await Promise.all(messageIds.map(m => getMessageById(m, false))) await Promise.all(messageIds.map(m => getMessageById(m, false)))
); );
const moreThanOne = selectedMessages.length > 1; const messageCount = selectedMessages.length;
const moreThanOne = messageCount > 1;
window.inboxStore?.dispatch( window.inboxStore?.dispatch(
updateConfirmModal({ updateConfirmModal({
title: window.i18n('deleteForEveryone'), title: window.i18n('deleteForEveryone'),
message: moreThanOne message: moreThanOne
? window.i18n('deleteMessagesQuestion') ? window.i18n('deleteMessagesQuestion', [messageCount.toString()])
: window.i18n('deleteMessageQuestion'), : window.i18n('deleteMessageQuestion'),
okText: window.i18n('deleteForEveryone'), okText: window.i18n('deleteForEveryone'),
okTheme: SessionButtonColor.Danger, okTheme: SessionButtonColor.Danger,

Loading…
Cancel
Save