pro/im_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolving merge conflict

Browse Source
This commit is contained in:
or-else
2021-01-27 09:42:25 -08:00
parent 4f38a2d8b1 1172adefb4
commit 6f47cc50b0
9 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/context-menu.jsx
+3 -3
View File
@@ -108,7 +108,7 @@ class ContextMenu extends React.Component {
handler: (params, errorHandler) => {
return props.onShowAlert(
formatMessage(messages.menu_item_clear_messages), // title
formatMessage(messages.clear_messages_warning), // content
formatMessage({id: 'clear_messages_warning'}), // content
(() => { this.deleteMessages(true, false, params, errorHandler); }), // onConfirm
null, // "OK"
true, // Show Reject button
@@ -122,7 +122,7 @@ class ContextMenu extends React.Component {
handler: (params, errorHandler) => {
return props.onShowAlert(
formatMessage(messages.menu_item_clear_messages_for_all), // title
formatMessage(messages.delete_messages_warning), // content
formatMessage({id: 'delete_messages_warning'}), // content
(() => { return this.deleteMessages(true, true, params, errorHandler); }),
null, // "OK"
true, // Show Reject button
@@ -229,7 +229,7 @@ class ContextMenu extends React.Component {
// menu_item_edit_permissions is defined elsewhere.
'permissions': {
id: 'permissions',
title: formatMessage(messages.menu_item_edit_permissions),
title: formatMessage({id: 'menu_item_edit_permissions'}),
handler: null
},
'member_delete': {