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

Replace "community" with "space" of keyboard shortcuts #7994

Merged
merged 2 commits into from
Mar 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 10 additions & 10 deletions src/accessibility/KeyboardShortcuts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@ export enum KeyBindingAction {
/** Opens user settings */
OpenUserSettings = "KeyBinding.openUserSettings",
/** Navigates backward */
PreviousVisitedRoomOrCommunity = "KeyBinding.previousVisitedRoomOrCommunity",
PreviousVisitedRoomOrSpace = "KeyBinding.PreviousVisitedRoomOrSpace",
/** Navigates forward */
NextVisitedRoomOrCommunity = "KeyBinding.nextVisitedRoomOrCommunity",
NextVisitedRoomOrSpace = "KeyBinding.NextVisitedRoomOrSpace",

/** Toggles microphone while on a call */
ToggleMicInCall = "KeyBinding.toggleMicInCall",
Expand Down Expand Up @@ -287,8 +287,8 @@ export const CATEGORIES: Record<CategoryName, ICategory> = {
KeyBindingAction.SelectPrevRoom,
KeyBindingAction.OpenUserSettings,
KeyBindingAction.SwitchToSpaceByNumber,
KeyBindingAction.PreviousVisitedRoomOrCommunity,
KeyBindingAction.NextVisitedRoomOrCommunity,
KeyBindingAction.PreviousVisitedRoomOrSpace,
KeyBindingAction.NextVisitedRoomOrSpace,
],
}, [CategoryName.AUTOCOMPLETE]: {
categoryLabel: _td("Autocomplete"),
Expand All @@ -310,8 +310,8 @@ export const CATEGORIES: Record<CategoryName, ICategory> = {
const DESKTOP_SHORTCUTS = [
KeyBindingAction.OpenUserSettings,
KeyBindingAction.SwitchToSpaceByNumber,
KeyBindingAction.PreviousVisitedRoomOrCommunity,
KeyBindingAction.NextVisitedRoomOrCommunity,
KeyBindingAction.PreviousVisitedRoomOrSpace,
KeyBindingAction.NextVisitedRoomOrSpace,
];

const MAC_ONLY_SHORTCUTS = [
Expand Down Expand Up @@ -606,21 +606,21 @@ export const KEYBOARD_SHORTCUTS: IKeyboardShortcuts = {
},
displayName: _td("Redo edit"),
},
[KeyBindingAction.PreviousVisitedRoomOrCommunity]: {
[KeyBindingAction.PreviousVisitedRoomOrSpace]: {
default: {
metaKey: isMac,
altKey: !isMac,
key: isMac ? Key.SQUARE_BRACKET_LEFT : Key.ARROW_LEFT,
},
displayName: _td("Previous recently visited room or community"),
displayName: _td("Previous recently visited room or space"),
},
[KeyBindingAction.NextVisitedRoomOrCommunity]: {
[KeyBindingAction.NextVisitedRoomOrSpace]: {
default: {
metaKey: isMac,
altKey: !isMac,
key: isMac ? Key.SQUARE_BRACKET_RIGHT : Key.ARROW_RIGHT,
},
displayName: _td("Next recently visited room or community"),
displayName: _td("Next recently visited room or space"),
},
[KeyBindingAction.SwitchToSpaceByNumber]: {
default: {
Expand Down
4 changes: 2 additions & 2 deletions src/components/structures/LoggedInView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -536,11 +536,11 @@ class LoggedInView extends React.Component<IProps, IState> {
unread: true,
});
break;
case KeyBindingAction.PreviousVisitedRoomOrCommunity:
case KeyBindingAction.PreviousVisitedRoomOrSpace:
PlatformPeg.get().navigateForwardBack(true);
handled = true;
break;
case KeyBindingAction.NextVisitedRoomOrCommunity:
case KeyBindingAction.NextVisitedRoomOrSpace:
PlatformPeg.get().navigateForwardBack(false);
handled = true;
break;
Expand Down
4 changes: 2 additions & 2 deletions src/i18n/strings/en_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -3461,8 +3461,8 @@
"Jump to last message": "Jump to last message",
"Undo edit": "Undo edit",
"Redo edit": "Redo edit",
"Previous recently visited room or community": "Previous recently visited room or community",
"Next recently visited room or community": "Next recently visited room or community",
"Previous recently visited room or space": "Previous recently visited room or space",
"Next recently visited room or space": "Next recently visited room or space",
"Switch to space by number": "Switch to space by number",
"Open user settings": "Open user settings",
"Close dialog or context menu": "Close dialog or context menu",
Expand Down