github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-19 02:42:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: correctly shortcut format on mac (#28556)

Browse Source 
On windows + are shown between keys, not on mac. The fix was to wrap the whole shortcut in `translateModKey`.
This commit is contained in:
Joffrey JAFFEUX 2024-08-26 20:58:23 +02:00 committed by GitHub
parent fe3d82a44a
commit fbc485c218
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options.js
View File

@ -27,8 +27,8 @@ export default class ToolbarPopupMenuOptions extends DropdownSelectBoxComponent
label = I18n.t(content.label); label = I18n.t(content.label);
if (content.shortcut) { if (content.shortcut) {
label += ` <kbd class="shortcut">${translateModKey( label += ` <kbd class="shortcut">${translateModKey(
PLATFORM_KEY_MODIFIER PLATFORM_KEY_MODIFIER + "+" + content.shortcut
)}+${translateModKey(content.shortcut)}</kbd>`; )}</kbd>`;
} }
} }
@ -37,8 +37,8 @@ export default class ToolbarPopupMenuOptions extends DropdownSelectBoxComponent
title = I18n.t(content.title); title = I18n.t(content.title);
if (content.shortcut) { if (content.shortcut) {
title += ` (${translateModKey( title += ` (${translateModKey(
PLATFORM_KEY_MODIFIER PLATFORM_KEY_MODIFIER + "+" + content.shortcut
)}+${translateModKey(content.shortcut)})`; )})`;
} }
} }