From fbc485c21874e2475ac8497d377acc5d756c596e Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 26 Aug 2024 20:58:23 +0200
Subject: [PATCH] FIX: correctly shortcut format on mac (#28556)

On windows + are shown between keys, not on mac. The fix was to wrap the whole shortcut in `translateModKey`.
---
 .../addon/components/toolbar-popup-menu-options.js        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options.js b/app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options.js
index b8ec6c432cc..8c388f1364a 100644
--- a/app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options.js
+++ b/app/assets/javascripts/select-kit/addon/components/toolbar-popup-menu-options.js
@@ -27,8 +27,8 @@ export default class ToolbarPopupMenuOptions extends DropdownSelectBoxComponent
             label = I18n.t(content.label);
             if (content.shortcut) {
               label += ` <kbd class="shortcut">${translateModKey(
-                PLATFORM_KEY_MODIFIER
-              )}+${translateModKey(content.shortcut)}</kbd>`;
+                PLATFORM_KEY_MODIFIER + "+" + content.shortcut
+              )}</kbd>`;
             }
           }
 
@@ -37,8 +37,8 @@ export default class ToolbarPopupMenuOptions extends DropdownSelectBoxComponent
             title = I18n.t(content.title);
             if (content.shortcut) {
               title += ` (${translateModKey(
-                PLATFORM_KEY_MODIFIER
-              )}+${translateModKey(content.shortcut)})`;
+                PLATFORM_KEY_MODIFIER + "+" + content.shortcut
+              )})`;
             }
           }