From 3976e9f2724b2abbec46cf5e7b1de3461aba756a Mon Sep 17 00:00:00 2001 From: Paul Neubauer Date: Thu, 28 Jul 2022 11:27:40 +0200 Subject: [PATCH] Fix shortcut translation --- packages/web-app-files/src/mixins/actions/copy.js | 6 ++++-- packages/web-app-files/src/mixins/actions/move.js | 6 ++++-- packages/web-app-files/src/mixins/actions/paste.js | 7 +++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/packages/web-app-files/src/mixins/actions/copy.js b/packages/web-app-files/src/mixins/actions/copy.js index db10a7cc2c6..c8e9e9c668c 100644 --- a/packages/web-app-files/src/mixins/actions/copy.js +++ b/packages/web-app-files/src/mixins/actions/copy.js @@ -11,8 +11,10 @@ export default { return window.navigator.platform.match('Mac') }, getCopyShortcutString() { - const modifierKey = this.isMacOs ? '⌘' : 'Ctrl' - return `${modifierKey} + C` + if (this.isMacOs) { + return this.$pgettext('Keyboard shortcut for macOS for copying files', '⌘ + C') + } + return this.$pgettext('Keyboard shortcut for non-macOS systems for copying files', 'Ctrl + C') }, $_copy_items() { return [ diff --git a/packages/web-app-files/src/mixins/actions/move.js b/packages/web-app-files/src/mixins/actions/move.js index 62fd399a6ed..ea47ed7d059 100644 --- a/packages/web-app-files/src/mixins/actions/move.js +++ b/packages/web-app-files/src/mixins/actions/move.js @@ -12,8 +12,10 @@ export default { return window.navigator.platform.match('Mac') }, getCutShortcutString() { - const modifierKey = this.isMacOs ? '⌘' : 'Ctrl' - return `${modifierKey} + X` + if (this.isMacOs) { + return this.$pgettext('Keyboard shortcut for macOS for cutting files', '⌘ + X') + } + return this.$pgettext('Keyboard shortcut for non-macOS systems for cutting files', 'Ctrl + X') }, $_move_items() { return [ diff --git a/packages/web-app-files/src/mixins/actions/paste.js b/packages/web-app-files/src/mixins/actions/paste.js index 878f2d709b0..1bbd84e6efa 100644 --- a/packages/web-app-files/src/mixins/actions/paste.js +++ b/packages/web-app-files/src/mixins/actions/paste.js @@ -10,10 +10,13 @@ export default { ...mapGetters('Files', ['clipboardResources']), isMacOs() { return window.navigator.platform.match('Mac') + }, getPasteShortcutString() { - const modifierKey = this.isMacOs ? '⌘' : 'Ctrl' - return `${modifierKey} + V` + if (this.isMacOs) { + return this.$pgettext('Keyboard shortcut for macOS for pasting files', '⌘ + V') + } + return this.$pgettext('Keyboard shortcut for non-macOS systems for pasting files', 'Ctrl + V') }, $_paste_items() { return [