Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve localizations and Fix recorder not allowing multiple modifiers when option is present #187

Merged
merged 2 commits into from
Oct 21, 2024
Merged

Improve localizations and Fix recorder not allowing multiple modifiers when option is present #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edfb33a
Improve localizations of zh-Hans and zh-TW
francisfeng Oct 21, 2024
afe668d
Fix shortcut recorder not allowing other modifiers when option is pre…
francisfeng Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Sources/KeyboardShortcuts/Localization/zh-Hans.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
"record_shortcut" = "设置快捷键";
"press_shortcut" = "按下快捷键";
"keyboard_shortcut_used_by_menu_item" = "当前快捷键无法使用，因为它已被用作菜单项 “%@” 的快捷键。";
"keyboard_shortcut_used_by_menu_item" = "当前快捷键无法使用，因为它已被用作菜单项“%@”的快捷键。";
"keyboard_shortcut_used_by_system" = "当前快捷键无法使用，因为它已被用作系统快捷键。";
"keyboard_shortcuts_can_be_changed" = "可以在 “系统设置 › 键盘 › 键盘快捷键” 中更改大多数系统快捷键。";
"keyboard_shortcut_disallowed" = "Option 修飾鍵必須與 Command 或 Control 組合使用。";
"keyboard_shortcuts_can_be_changed" = "可以在“系统设置 › 键盘 › 键盘快捷键”中更改大多数系统快捷键。";
"keyboard_shortcut_disallowed" = "Option键必须与Command键或Control键组合使用。";
"force_use_shortcut" = "强制使用";
"ok" = "好";
"space_key" = "空格";
2 changes: 1 addition & 1 deletion Sources/KeyboardShortcuts/Localization/zh-TW.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"keyboard_shortcut_used_by_menu_item" = "此快速鍵無法使用，因為它已被選單項目「%@」使用。";
"keyboard_shortcut_used_by_system" = "此快速鍵無法使用，因為它已被系統使用。";
"keyboard_shortcuts_can_be_changed" = "可以在「系統設定 › 鍵盤 › 鍵盤快速鍵」中更改大多數的系統快速鍵。";
"keyboard_shortcut_disallowed" = "Option 鍵必須與 Command 或 Control 鍵組合使用。";
"keyboard_shortcut_disallowed" = "Option鍵必須與Command鍵或Control鍵組合使用。";
"force_use_shortcut" = "強制使用";
"ok" = "好";
"space_key" = "空格";
2 changes: 1 addition & 1 deletion Sources/KeyboardShortcuts/Shortcut.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ extension KeyboardShortcuts.Shortcut {

// If Option is present, ensure there's at least one modifier other than Option and Shift
let otherModifiers: NSEvent.ModifierFlags = [.command, .control, .function, .capsLock]
return !modifiers.isDisjoint(with: otherModifiers)
return modifiers.isDisjoint(with: otherModifiers)
}

/**
Expand Down
Loading