vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: improve shortcuts for German keyboard layout (#31647)

Browse source 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
This commit is contained in:
Christian Werner 2025-07-06 19:03:04 +02:00 • committed by GitHub
parent 4fd2c8c338
commit 8978d24f9d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
frappe/public/js/frappe/ui/alt_keyboard_shortcuts.js
View file

@ -95,6 +95,23 @@ function get_shortcut_for_key(key) {
frappe.ui.keys.AltShortcutGroup = class AltShortcutGroup {
constructor() {
this.shortcuts_dict = {};
const locale = new Intl.Locale(navigator.language);
// Skip certain Keys for different Languages on different Platforms
switch (locale.language) {
case "de":
if (frappe.utils.is_mac()) {
this.blacklisted_letters = ["e", "l"];
} else {
this.blacklisted_letters = ["q"];
}
break;
default:
this.blacklisted_letters = [];
break;
}
$current_dropdown = null;
this.bind_events();
frappe.ui.keys.bind_shortcut_group_event();
@ -179,6 +196,10 @@ frappe.ui.keys.AltShortcutGroup = class AltShortcutGroup {
let is_in_global_shortcut = frappe.ui.keys.standard_shortcuts
.filter((s) => !s.page)
.some((s) => s.shortcut === `alt+${letter}`);
return letter in this.shortcuts_dict || is_in_global_shortcut;
return (
letter in this.shortcuts_dict ||
is_in_global_shortcut ||
this.blacklisted_letters.includes(letter.toLowerCase())
);
}
};

12
frappe/public/js/frappe/ui/page.js
View file

@ -526,11 +526,13 @@ frappe.ui.Page = class Page {
$li.addClass("user-action").insertBefore(this.divider);
}
// alt shortcut
frappe.ui.keys
.get_shortcut_group(parent.get(0))
.add($link, $link.find(".menu-item-label"));
// if an shortcut is already set, dont set an alt Shortcut
if (!shortcut) {
// alt shortcut
frappe.ui.keys
.get_shortcut_group(parent.get(0))
.add($link, $link.find(".menu-item-label"));
}
return $link;
}