From e54c3c84fb7d29787f717f00762756651b4c8dcd Mon Sep 17 00:00:00 2001 From: "Grigorii K. Shartsev" Date: Tue, 29 Oct 2024 11:31:01 +0100 Subject: [PATCH] fix(settings): show correct hotkey with CMD on macOS Signed-off-by: Grigorii K. Shartsev --- src/components/SettingsDialog/SettingsDialog.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/SettingsDialog/SettingsDialog.vue b/src/components/SettingsDialog/SettingsDialog.vue index 016ff70e92c..4dfd9453e7c 100644 --- a/src/components/SettingsDialog/SettingsDialog.vue +++ b/src/components/SettingsDialog/SettingsDialog.vue @@ -136,7 +136,7 @@
-
Ctrl +
+
{{ CmdOrCtrl }} +
{{ t('spreed', 'Edit your last message') }}
@@ -148,7 +148,7 @@
-
Ctrl + F
+
{{ CmdOrCtrl }} + F
{{ t('spreed', 'Search') }}
@@ -210,6 +210,7 @@ import { getTalkConfig } from '../../services/CapabilitiesManager.ts' import { useCustomSettings } from '../../services/SettingsAPI.ts' import { useSettingsStore } from '../../stores/settings.js' import { useSoundsStore } from '../../stores/sounds.js' +import { isMac } from '../../utils/browserCheck.ts' import { satisfyVersion } from '../../utils/satisfyVersion.ts' const serverVersion = loadState('core', 'config', {}).version ?? '29.0.0.0' @@ -237,8 +238,10 @@ export default { const soundsStore = useSoundsStore() const { customSettingsSections } = useCustomSettings() const isBackgroundBlurred = ref(isBackgroundBlurredState) + const CmdOrCtrl = isMac ? 'Cmd' : 'Ctrl' return { + CmdOrCtrl, settingsStore, soundsStore, supportTypingStatus,