From 52eec283b3779341f11a9ad090d256e102cc67b4 Mon Sep 17 00:00:00 2001 From: Janne Mareike Koschinski Date: Tue, 4 Apr 2023 21:00:57 +0200 Subject: [PATCH] Quick settings: Change the copy / labels on the options (#10427) * Quick settings: Change the copy / labels on the options * Update i18n --- cypress/e2e/sliding-sync/sliding-sync.ts | 2 +- .../views/context_menus/RoomNotificationContextMenu.tsx | 6 +++--- src/i18n/strings/en_EN.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cypress/e2e/sliding-sync/sliding-sync.ts b/cypress/e2e/sliding-sync/sliding-sync.ts index 2cae1a1218..10bd246797 100644 --- a/cypress/e2e/sliding-sync/sliding-sync.ts +++ b/cypress/e2e/sliding-sync/sliding-sync.ts @@ -202,7 +202,7 @@ describe("Sliding Sync", () => { // disable notifs in this room (TODO: CS API call?) cy.contains(".mx_RoomTile", "Test Room").find(".mx_RoomTile_notificationsButton").click({ force: true }); - cy.contains("Off").click(); + cy.contains("Mute room").click(); // create a new room so we know when the message has been received as it'll re-shuffle the room list cy.createRoom({ diff --git a/src/components/views/context_menus/RoomNotificationContextMenu.tsx b/src/components/views/context_menus/RoomNotificationContextMenu.tsx index 0e5d608f7e..5455439039 100644 --- a/src/components/views/context_menus/RoomNotificationContextMenu.tsx +++ b/src/components/views/context_menus/RoomNotificationContextMenu.tsx @@ -52,7 +52,7 @@ export const RoomNotificationContextMenu: React.FC = ({ room, onFinished const defaultOption: JSX.Element = ( setNotificationState(RoomNotifState.AllMessages))} @@ -70,7 +70,7 @@ export const RoomNotificationContextMenu: React.FC = ({ room, onFinished const mentionsOption: JSX.Element = ( setNotificationState(RoomNotifState.MentionsOnly))} @@ -79,7 +79,7 @@ export const RoomNotificationContextMenu: React.FC = ({ room, onFinished const muteOption: JSX.Element = ( setNotificationState(RoomNotifState.Mute))} diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index f67847fd92..fb597faa65 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -3255,8 +3255,8 @@ "Low Priority": "Low Priority", "Forget Room": "Forget Room", "Mark as read": "Mark as read", - "Use default": "Use default", - "Mentions & Keywords": "Mentions & Keywords", + "Match default setting": "Match default setting", + "Mute room": "Mute room", "See room timeline (devtools)": "See room timeline (devtools)", "Space": "Space", "Space home": "Space home",