From 03d1aee82057d4cfc589b0892f807d4815d51e0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Fri, 21 Jan 2022 18:56:08 +0100 Subject: [PATCH 1/4] Expose redaction power level in room settings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- .../views/settings/tabs/room/RolesRoomSettingsTab.tsx | 2 ++ src/i18n/strings/en_EN.json | 1 + 2 files changed, 3 insertions(+) diff --git a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx index d14f54fd38f..0c02e1c2727 100644 --- a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx +++ b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx @@ -58,6 +58,7 @@ const plEventsToShow: Record = { [EventType.RoomServerAcl]: { isState: true, hideForSpace: true }, [EventType.RoomPinnedEvents]: { isState: true, hideForSpace: true }, [EventType.Reaction]: { isState: false, hideForSpace: true }, + [EventType.RoomRedaction]: { isState: false, hideForSpace: true }, // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111) "im.vector.modular.widgets": { isState: true, hideForSpace: true }, @@ -237,6 +238,7 @@ export default class RolesRoomSettingsTab extends React.Component { [EventType.RoomEncryption]: _td("Enable room encryption"), [EventType.RoomServerAcl]: _td("Change server ACLs"), [EventType.Reaction]: _td("Send reactions"), + [EventType.RoomRedaction]: _td("Redact messages"), // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111) "im.vector.modular.widgets": isSpaceRoom ? null : _td("Modify widgets"), diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 83d550a60b5..b90f50d792a 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1590,6 +1590,7 @@ "Enable room encryption": "Enable room encryption", "Change server ACLs": "Change server ACLs", "Send reactions": "Send reactions", + "Redact messages": "Redact messages", "Modify widgets": "Modify widgets", "Manage pinned events": "Manage pinned events", "Default role": "Default role", From 7f1a799df6c553c4ff468b21e312d72b6b48dd1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Mon, 24 Jan 2022 13:08:02 +0100 Subject: [PATCH 2/4] Amend Redact messages string MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- .../views/settings/tabs/room/RolesRoomSettingsTab.tsx | 2 +- src/i18n/strings/en_EN.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx index 0c02e1c2727..6dd5d000b2d 100644 --- a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx +++ b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx @@ -238,7 +238,7 @@ export default class RolesRoomSettingsTab extends React.Component { [EventType.RoomEncryption]: _td("Enable room encryption"), [EventType.RoomServerAcl]: _td("Change server ACLs"), [EventType.Reaction]: _td("Send reactions"), - [EventType.RoomRedaction]: _td("Redact messages"), + [EventType.RoomRedaction]: _td("Remove messages"), // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111) "im.vector.modular.widgets": isSpaceRoom ? null : _td("Modify widgets"), diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index b90f50d792a..90bbdfe5321 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1590,7 +1590,7 @@ "Enable room encryption": "Enable room encryption", "Change server ACLs": "Change server ACLs", "Send reactions": "Send reactions", - "Redact messages": "Redact messages", + "Remove messages": "Remove messages", "Modify widgets": "Modify widgets", "Manage pinned events": "Manage pinned events", "Default role": "Default role", From 92619459364032e60380fc18eced3df70464a811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Mon, 28 Feb 2022 17:58:23 +0100 Subject: [PATCH 3/4] Change `RoomRedaction` string MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- .../views/settings/tabs/room/RolesRoomSettingsTab.tsx | 2 +- src/i18n/strings/en_EN.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx index f373c9ea831..27d72a46f03 100644 --- a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx +++ b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx @@ -242,7 +242,7 @@ export default class RolesRoomSettingsTab extends React.Component { [EventType.RoomEncryption]: _td("Enable room encryption"), [EventType.RoomServerAcl]: _td("Change server ACLs"), [EventType.Reaction]: _td("Send reactions"), - [EventType.RoomRedaction]: _td("Remove messages"), + [EventType.RoomRedaction]: _td("Remove messages sent by me"), // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111) "im.vector.modular.widgets": isSpaceRoom ? null : _td("Modify widgets"), diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 3de62fc89a9..89e5d01ad75 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1580,7 +1580,7 @@ "Enable room encryption": "Enable room encryption", "Change server ACLs": "Change server ACLs", "Send reactions": "Send reactions", - "Remove messages": "Remove messages", + "Remove messages sent by others": "Remove messages sent by others", "Modify widgets": "Modify widgets", "Manage pinned events": "Manage pinned events", "Default role": "Default role", @@ -1589,7 +1589,6 @@ "Change settings": "Change settings", "Remove users": "Remove users", "Ban users": "Ban users", - "Remove messages sent by others": "Remove messages sent by others", "Notify everyone": "Notify everyone", "No users have specific privileges in this room": "No users have specific privileges in this room", "Privileged Users": "Privileged Users", From 743be9b4468f5c1aea089837be030cbdbdce4fa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Mon, 28 Feb 2022 18:13:31 +0100 Subject: [PATCH 4/4] i18n MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- src/i18n/strings/en_EN.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 89e5d01ad75..d6d3c95ce14 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1580,7 +1580,7 @@ "Enable room encryption": "Enable room encryption", "Change server ACLs": "Change server ACLs", "Send reactions": "Send reactions", - "Remove messages sent by others": "Remove messages sent by others", + "Remove messages sent by me": "Remove messages sent by me", "Modify widgets": "Modify widgets", "Manage pinned events": "Manage pinned events", "Default role": "Default role", @@ -1589,6 +1589,7 @@ "Change settings": "Change settings", "Remove users": "Remove users", "Ban users": "Ban users", + "Remove messages sent by others": "Remove messages sent by others", "Notify everyone": "Notify everyone", "No users have specific privileges in this room": "No users have specific privileges in this room", "Privileged Users": "Privileged Users",