From 78e908c761e8e5b3e8dd1b11cd2ff540b41891c7 Mon Sep 17 00:00:00 2001 From: Nriver <6752679+Nriver@users.noreply.github.com> Date: Wed, 14 Aug 2024 17:12:33 +0800 Subject: [PATCH] add translation for shortcuts.js --- .../widgets/type_widgets/options/shortcuts.js | 41 ++++++++++--------- src/public/translations/cn/translation.json | 13 ++++++ src/public/translations/en/translation.json | 13 ++++++ 3 files changed, 47 insertions(+), 20 deletions(-) diff --git a/src/public/app/widgets/type_widgets/options/shortcuts.js b/src/public/app/widgets/type_widgets/options/shortcuts.js index 9430ba85f..19a6272c1 100644 --- a/src/public/app/widgets/type_widgets/options/shortcuts.js +++ b/src/public/app/widgets/type_widgets/options/shortcuts.js @@ -2,6 +2,7 @@ import server from "../../../services/server.js"; import utils from "../../../services/utils.js"; import dialogService from "../../../services/dialog.js"; import OptionsWidget from "./options_widget.js"; +import { t } from "../../../services/i18n.js"; const TPL = `
@@ -25,25 +26,25 @@ const TPL = ` } -

Keyboard Shortcuts

+

${t('shortcuts.keyboard_shortcuts')}

- Multiple shortcuts for the same action can be separated by comma. - See Electron documentation for available modifiers and key codes. + ${t('shortcuts.multiple_shortcuts')} + ${t('shortcuts.electron_documentation')}

- +
- - - - + + + + @@ -51,9 +52,9 @@ const TPL = `
- + - +
`; @@ -83,10 +84,10 @@ export default class KeyboardShortcutsOptions extends OptionsWidget { else { $tr.append($("
Action nameShortcutsDefault shortcutsDescription${t('shortcuts.action_name')}${t('shortcuts.shortcuts')}${t('shortcuts.default_shortcuts')}${t('shortcuts.description')}
").text(action.actionName)) .append($("").append( - $(``) - .val(action.effectiveShortcuts.join(", ")) - .attr('data-keyboard-action-name', action.actionName) - .attr('data-default-keyboard-shortcuts', action.defaultShortcuts.join(", ")) + $(``) + .val(action.effectiveShortcuts.join(", ")) + .attr('data-keyboard-action-name', action.actionName) + .attr('data-default-keyboard-shortcuts', action.defaultShortcuts.join(", ")) ) ) .append($("").text(action.defaultShortcuts.join(", "))) @@ -101,10 +102,10 @@ export default class KeyboardShortcutsOptions extends OptionsWidget { const $input = this.$widget.find(e.target); const actionName = $input.attr('data-keyboard-action-name'); const shortcuts = $input.val() - .replace('+,', "+Comma") - .split(",") - .map(shortcut => shortcut.replace("+Comma", "+,")) - .filter(shortcut => !!shortcut); + .replace('+,', "+Comma") + .split(",") + .map(shortcut => shortcut.replace("+Comma", "+,")) + .filter(shortcut => !!shortcut); const optionName = `keyboardShortcuts${actionName.substr(0, 1).toUpperCase()}${actionName.substr(1)}`; @@ -112,7 +113,7 @@ export default class KeyboardShortcutsOptions extends OptionsWidget { }); this.$widget.find(".options-keyboard-shortcuts-set-all-to-default").on('click', async () => { - if (!await dialogService.confirm("Do you really want to reset all keyboard shortcuts to the default?")) { + if (!await dialogService.confirm(t('shortcuts.confirm_reset'))) { return; } @@ -152,7 +153,7 @@ export default class KeyboardShortcutsOptions extends OptionsWidget { return; } - this.$widget.find(el).toggle(!!( // !! to avoid toggle overloads with different behavior + this.$widget.find(el).toggle(!!( action.actionName.toLowerCase().includes(filter) || action.defaultShortcuts.some(shortcut => shortcut.toLowerCase().includes(filter)) || action.effectiveShortcuts.some(shortcut => shortcut.toLowerCase().includes(filter)) diff --git a/src/public/translations/cn/translation.json b/src/public/translations/cn/translation.json index ba35e9a8f..2efb60d67 100644 --- a/src/public/translations/cn/translation.json +++ b/src/public/translations/cn/translation.json @@ -1181,5 +1181,18 @@ "set_password": "设置密码", "password_mismatch": "新密码不一致。", "password_changed_success": "密码已更改。按 OK 后 Trilium 将重新加载。" + }, + "shortcuts": { + "keyboard_shortcuts": "快捷键", + "multiple_shortcuts": "同一操作的多个快捷键可以用逗号分隔。", + "electron_documentation": "请参阅 Electron文档，了解可用的修饰符和键码。", + "type_text_to_filter": "输入文字以过滤快捷键...", + "action_name": "操作名称", + "shortcuts": "快捷键", + "default_shortcuts": "默认快捷键", + "description": "描述", + "reload_app": "重新加载应用以应用更改", + "set_all_to_default": "将所有快捷键重置为默认值", + "confirm_reset": "您确定要将所有键盘快捷键重置为默认值吗？" } } diff --git a/src/public/translations/en/translation.json b/src/public/translations/en/translation.json index f36f6d93a..1fc78b79e 100644 --- a/src/public/translations/en/translation.json +++ b/src/public/translations/en/translation.json @@ -1182,5 +1182,18 @@ "set_password": "Set Password", "password_mismatch": "New passwords are not the same.", "password_changed_success": "Password has been changed. Trilium will be reloaded after you press OK." + }, + "shortcuts": { + "keyboard_shortcuts": "Keyboard Shortcuts", + "multiple_shortcuts": "Multiple shortcuts for the same action can be separated by comma.", + "electron_documentation": "See Electron documentation for available modifiers and key codes.", + "type_text_to_filter": "Type text to filter shortcuts...", + "action_name": "Action name", + "shortcuts": "Shortcuts", + "default_shortcuts": "Default shortcuts", + "description": "Description", + "reload_app": "Reload app to apply changes", + "set_all_to_default": "Set all shortcuts to the default", + "confirm_reset": "Do you really want to reset all keyboard shortcuts to the default?" } }