From 45eae6e956ebe941ac931e43b08e056be726fc55 Mon Sep 17 00:00:00 2001
From: Ryan Miller <ryan.m@getsession.org>
Date: Mon, 19 Feb 2024 14:49:31 +1100
Subject: [PATCH] fix: add withAcceleratorPrefix function to remove accelerator
 prefixes from locale strings

---
 _locales/en/messages.json | 13 +++++--------
 ts/node/menu.ts           | 21 ++++++++++++++++-----
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 176161e2c..277008eae 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -2,14 +2,11 @@
   "copyErrorAndQuit": "Copy error and quit",
   "unknown": "Unknown",
   "databaseError": "Database Error",
-  "mainMenuFile": "&File",
-  "mainMenuEdit": "&Edit",
-  "mainMenuView": "&View",
-  "mainMenuWindow": "&Window",
-  "mainMenuHelp": "&Help",
-  "appMenuHide": "Hide",
-  "appMenuHideOthers": "Hide Others",
-  "appMenuUnhide": "Show All",
+  "file": "File",
+  "edit": "Edit",
+  "view": "View",
+  "window": "Window",
+  "sessionHelp": "Help",
   "appMenuQuit": "Quit Session",
   "editMenuUndo": "Undo",
   "editMenuRedo": "Redo",
diff --git a/ts/node/menu.ts b/ts/node/menu.ts
index fb2862e1b..a9516a456 100644
--- a/ts/node/menu.ts
+++ b/ts/node/menu.ts
@@ -2,6 +2,17 @@ import { isString } from 'lodash';
 import { LocaleMessagesType } from './locale';
 import { Noop } from '../types/Util';
 
+/**
+ * Adds the accelerator prefix to the label for the menu item
+ * @link https://www.electronjs.org/docs/latest/api/menu#static-methods
+ *
+ * @param label - The label for the menu item
+ * @returns The label with the accelerator prefix
+ */
+const withAcceleratorPrefix = (label:string) => {
+  return `&${label}`;
+}
+
 export const createTemplate = (
   options: {
     openReleaseNotes: () => void;
@@ -28,7 +39,7 @@ export const createTemplate = (
 
   const template = [
     {
-      label: messages.mainMenuFile,
+      label: withAcceleratorPrefix(messages.file),
       submenu: [
         {
           type: 'separator',
@@ -40,7 +51,7 @@ export const createTemplate = (
       ],
     },
     {
-      label: messages.mainMenuEdit,
+      label: withAcceleratorPrefix(messages.edit),
       submenu: [
         {
           role: 'undo',
@@ -76,7 +87,7 @@ export const createTemplate = (
       ],
     },
     {
-      label: messages.mainMenuView,
+      label: withAcceleratorPrefix(messages.view),
       submenu: [
         {
           role: 'resetzoom',
@@ -115,7 +126,7 @@ export const createTemplate = (
       ],
     },
     {
-      label: messages.mainMenuWindow,
+      label: withAcceleratorPrefix(messages.window),
       role: 'window',
       submenu: [
         {
@@ -125,7 +136,7 @@ export const createTemplate = (
       ],
     },
     {
-      label: messages.mainMenuHelp,
+      label: withAcceleratorPrefix(messages.sessionHelp),
       role: 'help',
       submenu: [
         {