mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions 1

Localize accelerators in custom menu

Browse source
This commit is contained in:
Fedor Indutny 2022-07-06 09:23:37 -07:00 • committed by GitHub
parent 064f3dd0e0
commit 5d1702c2fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ts/components/TitleBarContainer.tsx
View file

@ -63,7 +63,8 @@ ROLE_TO_ACCELERATOR.set('minimize', 'CmdOrCtrl+M');
function convertMenu(
menuList: ReadonlyArray<MenuItemConstructorOptions>,
executeMenuRole: (role: MenuItemConstructorOptions['role']) => void
executeMenuRole: (role: MenuItemConstructorOptions['role']) => void,
localeMessages: LocaleMessagesType
): Array<MenuItem> {
return menuList.map(item => {
const {
@ -77,7 +78,7 @@ function convertMenu(
let submenu: Array<MenuItem> | undefined;
if (Array.isArray(originalSubmenu)) {
submenu = convertMenu(originalSubmenu, executeMenuRole);
submenu = convertMenu(originalSubmenu, executeMenuRole, localeMessages);
} else if (originalSubmenu) {
throw new Error('Non-array submenu is not supported');
}
@ -101,6 +102,18 @@ function convertMenu(
accelerator = ROLE_TO_ACCELERATOR.get(role);
}
// Custom titlebar is visible only on Windows and this string is used only
// in UI. Actual accelerator interception is handled by Electron through
// `app/main.ts`.
accelerator = accelerator?.replace(
/CommandOrControl|CmdOrCtrl/g,
localeMessages['Keyboard--Key--ctrl'].message
);
accelerator = accelerator?.replace(
/Shift/g,
localeMessages['Keyboard--Key--shift'].message
);
return {
type,
label,
@ -233,7 +246,7 @@ export const TitleBarContainer = (props: PropsType): JSX.Element => {
localeMessages
);
maybeMenu = convertMenu(menuTemplate, executeMenuRole);
maybeMenu = convertMenu(menuTemplate, executeMenuRole, localeMessages);
}
return (