Skip to content

Make notification settings copy/layout more user-friendly #34120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mxandreas wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Make notification settings copy/layout more user-friendly #34120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 apps/web/src/components/views/settings/Notifications.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ const RULE_DISPLAY_ORDER: string[] = [
RuleId.EncryptedMessage,

// Mentions
RuleId.ContainsDisplayName,
RuleId.ContainsUserName,
RuleId.AtRoomNotification,
RuleId.ContainsDisplayName,

// Other
RuleId.InviteToSelf,
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ export default class NotificationsSettingsTab extends React.Component<IProps, IS
value: RoomNotifState.Mute,
label: (
<>
{_t("common|off")}
{_t("common|mute")}
<div className="mx_NotificationSettingsTab_microCopy">
{_t("notifications|mute_description")}
</div>
Expand Down
8 changes: 4 additions & 4 deletions apps/web/src/i18n/strings/en_EN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1722,8 +1722,8 @@
"level_notification": "Notification",
"level_unsent": "Unsent",
"mark_all_read": "Mark all as read",
"mentions_and_keywords": "@mentions & keywords",
"mentions_and_keywords_description": "Get notified only with mentions and keywords as set up in your <a>settings</a>",
"mentions_and_keywords": "@mentions and replies only",
"mentions_and_keywords_description": "Get notified only with mentions, replies and keywords as set up in your <a>settings</a>",
"mentions_keywords": "Mentions and keywords",
"message_didnt_send": "Message didn't send. Click for info.",
"mute_description": "You won't get any notifications"
Expand Down Expand Up @@ -2764,13 +2764,13 @@
"room_activity": "New room activity, upgrades and status messages occur",
"rule_call": "Call invitation",
"rule_contains_display_name": "Messages containing my display name",
"rule_contains_user_name": "Messages containing my username",
"rule_contains_user_name": "@mentions and replies",
"rule_encrypted": "Encrypted messages in group chats",
"rule_encrypted_room_one_to_one": "Encrypted messages in one-to-one chats",
"rule_invite_for_me": "When I'm invited to a room",
"rule_message": "Messages in group chats",
"rule_room_one_to_one": "Messages in one-to-one chats",
"rule_roomnotif": "Messages containing @room",
"rule_roomnotif": "@room mentions",
"rule_suppress_notices": "Messages sent by bot",
"rule_tombstone": "When rooms are upgraded",
"show_message_desktop_notification": "Show message in desktop notification",
Expand Down
2 changes: 1 addition & 1 deletion .../web/test/unit-tests/components/views/settings/tabs/room/NotificationSettingsTab-test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ describe("NotificationSettingsTab", () => {
const tab = renderTab();

// settings link of mentions_only volume
const settingsLink = within(tab.getByText("@mentions & keywords")).getByRole("button", { name: "settings" });
const settingsLink = within(tab.getByText("@mentions and replies only")).getByRole("button", { name: "settings" });
if (!settingsLink) throw new Error("settings link does not exist.");

await userEvent.click(settingsLink);
Expand Down
Loading