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

Commit b7099f8

Browse files
authored
Translate keyboard shortcut alternate key names (#7633)
1 parent 88cd2f8 commit b7099f8

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

src/components/structures/RoomSearch.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@ import { getKeyBindingsManager, RoomListAction } from "../../KeyBindingsManager"
2929
import { replaceableComponent } from "../../utils/replaceableComponent";
3030
import SpaceStore from "../../stores/spaces/SpaceStore";
3131
import { UPDATE_SELECTED_SPACE } from "../../stores/spaces";
32-
import { isMac } from "../../Keyboard";
32+
import { isMac, Key } from "../../Keyboard";
3333
import SettingsStore from "../../settings/SettingsStore";
3434
import Modal from "../../Modal";
3535
import SpotlightDialog from "../views/dialogs/SpotlightDialog";
36+
import { ALTERNATE_KEY_NAME } from "../../accessibility/KeyboardShortcuts";
3637

3738
interface IProps {
3839
isMinimized: boolean;
@@ -204,7 +205,7 @@ export default class RoomSearch extends React.PureComponent<IProps, IState> {
204205
/>
205206
);
206207
let shortcutPrompt = <div className="mx_RoomSearch_shortcutPrompt" onClick={this.focus}>
207-
{ isMac ? "⌘ K" : "Ctrl K" }
208+
{ isMac ? "⌘ K" : _t(ALTERNATE_KEY_NAME[Key.CONTROL]) + " K" }
208209
</div>;
209210

210211
if (this.props.isMinimized) {

src/components/views/rooms/BasicMessageComposer.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ import DocumentPosition from "../../../editor/position";
5050
import { ICompletion } from "../../../autocomplete/Autocompleter";
5151
import { AutocompleteAction, getKeyBindingsManager, MessageComposerAction } from '../../../KeyBindingsManager';
5252
import { replaceableComponent } from "../../../utils/replaceableComponent";
53+
import { ALTERNATE_KEY_NAME } from '../../../accessibility/KeyboardShortcuts';
54+
import { _t } from "../../../languageHandler";
5355

5456
// matches emoticons which follow the start of a line or whitespace
5557
const REGEX_EMOTICON_WHITESPACE = new RegExp('(?:^|\\s)(' + EMOTICON_REGEX.source + ')\\s|:^$');
@@ -66,7 +68,7 @@ const SURROUND_WITH_DOUBLE_CHARACTERS = new Map([
6668
]);
6769

6870
function ctrlShortcutLabel(key: string): string {
69-
return (IS_MAC ? "⌘" : "Ctrl") + "+" + key;
71+
return (IS_MAC ? "⌘" : _t(ALTERNATE_KEY_NAME[Key.CONTROL])) + "+" + key;
7072
}
7173

7274
function cloneSelection(selection: Selection): Partial<Selection> {

src/components/views/spaces/SpacePanel.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,13 @@ import QuickSettingsButton from "./QuickSettingsButton";
6262
import { useSettingValue } from "../../../hooks/useSettings";
6363
import UserMenu from "../../structures/UserMenu";
6464
import IndicatorScrollbar from "../../structures/IndicatorScrollbar";
65-
import { isMac } from "../../../Keyboard";
65+
import { isMac, Key } from "../../../Keyboard";
6666
import { useDispatcher } from "../../../hooks/useDispatcher";
6767
import defaultDispatcher from "../../../dispatcher/dispatcher";
6868
import { ActionPayload } from "../../../dispatcher/payloads";
6969
import { Action } from "../../../dispatcher/actions";
7070
import { NotificationState } from "../../../stores/notifications/NotificationState";
71+
import { ALTERNATE_KEY_NAME } from "../../../accessibility/KeyboardShortcuts";
7172

7273
const useSpaces = (): [Room[], MetaSpace[], Room[], SpaceKey] => {
7374
const invites = useEventEmitterState<Room[]>(SpaceStore.instance, UPDATE_INVITED_SPACES, () => {
@@ -340,7 +341,11 @@ const SpacePanel = () => {
340341
{ isPanelCollapsed ? _t("Expand") : _t("Collapse") }
341342
</div>
342343
<div className="mx_Tooltip_sub">
343-
{ isMac ? "⌘ + ⇧ + D" : "Ctrl + Shift + D" }
344+
{ isMac
345+
? "⌘ + ⇧ + D"
346+
: _t(ALTERNATE_KEY_NAME[Key.CONTROL]) + " + " +
347+
_t(ALTERNATE_KEY_NAME[Key.SHIFT]) + " + D"
348+
}
344349
</div>
345350
</div>}
346351
/>

0 commit comments

Comments
 (0)