Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Quick settings: Change the copy / labels on the options #10427

Merged
merged 3 commits into from
Apr 4, 2023
Merged

Quick settings: Change the copy / labels on the options #10427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37a9cdd
Quick settings: Change the copy / labels on the options
justjanne Mar 22, 2023
ec5d3a0
Update i18n
justjanne Mar 22, 2023
a1c6a9c
Fix hardcoded button label in sliding-sync test
justjanne Apr 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cypress/e2e/sliding-sync/sliding-sync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
6 changes: 3 additions & 3 deletions src/components/views/context_menus/RoomNotificationContextMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const RoomNotificationContextMenu: React.FC<IProps> = ({ room, onFinished

const defaultOption: JSX.Element = (
<IconizedContextMenuRadio
label={_t("Use default")}
label={_t("Match default setting")}
active={notificationState === RoomNotifState.AllMessages}
iconClassName="mx_RoomNotificationContextMenu_iconBell"
onClick={wrapHandler(() => setNotificationState(RoomNotifState.AllMessages))}
Expand All @@ -70,7 +70,7 @@ export const RoomNotificationContextMenu: React.FC<IProps> = ({ room, onFinished

const mentionsOption: JSX.Element = (
<IconizedContextMenuRadio
label={_t("Mentions & Keywords")}
label={_t("Mentions & keywords")}
active={notificationState === RoomNotifState.MentionsOnly}
iconClassName="mx_RoomNotificationContextMenu_iconBellMentions"
onClick={wrapHandler(() => setNotificationState(RoomNotifState.MentionsOnly))}
Expand All @@ -79,7 +79,7 @@ export const RoomNotificationContextMenu: React.FC<IProps> = ({ room, onFinished

const muteOption: JSX.Element = (
<IconizedContextMenuRadio
label={_t("Off")}
label={_t("Mute room")}
active={notificationState === RoomNotifState.Mute}
iconClassName="mx_RoomNotificationContextMenu_iconBellCrossed"
onClick={wrapHandler(() => setNotificationState(RoomNotifState.Mute))}
Expand Down
4 changes: 2 additions & 2 deletions src/i18n/strings/en_EN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down