Skip to content

Commit

Permalink
fix(settings): show correct hotkey with CMD on macOS
Browse files Browse the repository at this point in the history
Signed-off-by: Grigorii K. Shartsev <[email protected]>
  • Loading branch information
ShGKme authored and backportbot[bot] committed Nov 6, 2024
1 parent dfa7850 commit e54c3c8
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/components/SettingsDialog/SettingsDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
</dd>
</div>
<div>
<dt><kbd>Ctrl</kbd> + <kbd>↑</kbd></dt>
<dt><kbd>{{ CmdOrCtrl }}</kbd> + <kbd>↑</kbd></dt>
<dd class="shortcut-description">
{{ t('spreed', 'Edit your last message') }}
</dd>
Expand All @@ -148,7 +148,7 @@
</dd>
</div>
<div>
<dt><kbd>Ctrl</kbd> + <kbd>F</kbd></dt>
<dt><kbd>{{ CmdOrCtrl }}</kbd> + <kbd>F</kbd></dt>
<dd class="shortcut-description">
{{ t('spreed', 'Search') }}
</dd>
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit e54c3c8

Please sign in to comment.