Merge remote-tracking branch 'origin/develop' into release

1 files changed, 10 insertions, 9 deletions

diff --git a/src/environment.js b/src/environment.js
index 42c6b2927..f8a51b207 100644
--- a/src/environment.js
+++ b/src/environment.js
@@ -31,6 +31,7 @@ export const ferdiVersion = app.getVersion();
 export const electronVersion = process.versions.electron;
 export const chromeVersion = process.versions.chrome;
 export const nodeVersion = process.versions.node;
+export const ferdiLocale = app.getLocale();
 
 // Set app directory before loading user modules
 if (process.env.FERDI_APPDATA_DIR != null) {
@@ -78,17 +79,17 @@ export const is64Bit = osArch.match(/64/);
 const ctrlKey = isMac ? '⌘' : 'Ctrl';
 const cmdKey = isMac ? 'Cmd' : 'Ctrl';
 
-export const altKey = isMac ? '⌥' : 'Alt';
-export const shiftKey = isMac ? '⇧' : 'Shift';
+export const altKey = (isAccelerator = true) => (!isAccelerator && isMac ? '⌥' : 'Alt');
+export const shiftKey = (isAccelerator = true) => (!isAccelerator && isMac ? '⇧' : 'Shift');
 
 // Platform specific shortcut keys
-export const shortcutKey = (isAccelerator = true) => (isAccelerator ? cmdKey : ctrlKey);
-export const lockFerdiShortcutKey = (isAccelerator = true) => `${shortcutKey(isAccelerator)}+${shiftKey}+L`;
-export const todosToggleShortcutKey = (isAccelerator = true) => `${shortcutKey(isAccelerator)}+T`;
-export const workspaceToggleShortcutKey = (isAccelerator = true) => `${shortcutKey(isAccelerator)}+D`;
-export const muteFerdiShortcutKey = (isAccelerator = true) => `${shortcutKey(isAccelerator)}+${shiftKey}+M`;
-export const addNewServiceShortcutKey = (isAccelerator = true) => `${shortcutKey(isAccelerator)}+N`;
-export const settingsShortcutKey = (isAccelerator = true) => `${shortcutKey(isAccelerator)}+${isMac ? ',' : 'P'}`;
+export const cmdOrCtrlShortcutKey = (isAccelerator = true) => (isAccelerator ? cmdKey : ctrlKey);
+export const lockFerdiShortcutKey = (isAccelerator = true) => `${cmdOrCtrlShortcutKey(isAccelerator)}+${shiftKey(isAccelerator)}+L`;
+export const todosToggleShortcutKey = (isAccelerator = true) => `${cmdOrCtrlShortcutKey(isAccelerator)}+T`;
+export const workspaceToggleShortcutKey = (isAccelerator = true) => `${cmdOrCtrlShortcutKey(isAccelerator)}+D`;
+export const muteFerdiShortcutKey = (isAccelerator = true) => `${cmdOrCtrlShortcutKey(isAccelerator)}+${shiftKey(isAccelerator)}+M`;
+export const addNewServiceShortcutKey = (isAccelerator = true) => `${cmdOrCtrlShortcutKey(isAccelerator)}+N`;
+export const settingsShortcutKey = (isAccelerator = true) => `${cmdOrCtrlShortcutKey(isAccelerator)}+${isMac ? ',' : 'P'}`;
 
 let api;
 let wsApi;