diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js index 947fb14988..0fc3b114fb 100644 --- a/frappe/public/js/frappe/form/toolbar.js +++ b/frappe/public/js/frappe/form/toolbar.js @@ -453,7 +453,7 @@ frappe.ui.form.Toolbar = class Toolbar { }, true, { - shortcut: "ctrl+z", + shortcut: "Ctrl+Z", condition: () => !this.frm.is_form_builder(), description: __("Undo last action"), } @@ -465,7 +465,7 @@ frappe.ui.form.Toolbar = class Toolbar { }, true, { - shortcut: "ctrl+y", + shortcut: "Ctrl+Y", condition: () => !this.frm.is_form_builder(), description: __("Redo last action"), } diff --git a/frappe/public/js/frappe/ui/keyboard.js b/frappe/public/js/frappe/ui/keyboard.js index befbddb3e9..4ddb5a7df1 100644 --- a/frappe/public/js/frappe/ui/keyboard.js +++ b/frappe/public/js/frappe/ui/keyboard.js @@ -98,7 +98,7 @@ frappe.ui.keys.show_keyboard_shortcut_dialog = () => { .map(frappe.utils.to_title_case) .join("+"); if (frappe.utils.is_mac()) { - shortcut_label = shortcut_label.replace("Ctrl", "⌘"); + shortcut_label = shortcut_label.replace("Ctrl", "⌘").replace("Alt", "⌥"); } return ` ${shortcut_label} diff --git a/frappe/public/js/frappe/ui/page.js b/frappe/public/js/frappe/ui/page.js index ec1b0de2a0..d2143d50ad 100644 --- a/frappe/public/js/frappe/ui/page.js +++ b/frappe/public/js/frappe/ui/page.js @@ -536,7 +536,9 @@ frappe.ui.Page = class Page { } // label if (frappe.utils.is_mac()) { - shortcut_obj.shortcut_label = shortcut_obj.shortcut.replace("Ctrl", "⌘"); + shortcut_obj.shortcut_label = shortcut_obj.shortcut + .replace("Ctrl", "⌘") + .replace("Alt", "⌥"); } else { shortcut_obj.shortcut_label = shortcut_obj.shortcut; } diff --git a/frappe/public/js/frappe/ui/toolbar/navbar.html b/frappe/public/js/frappe/ui/toolbar/navbar.html index db478939b8..c8fdb346bc 100644 --- a/frappe/public/js/frappe/ui/toolbar/navbar.html +++ b/frappe/public/js/frappe/ui/toolbar/navbar.html @@ -26,7 +26,7 @@ id="navbar-search" type="text" class="form-control" - placeholder="{%= __("Search or type a command (Ctrl + G)") %}" + placeholder="{%= __('Search or type a command ({0})', [frappe.utils.is_mac() ? '⌘ + G' : 'Ctrl + G']) %}" aria-haspopup="true" >