aboutsummaryrefslogtreecommitdiffstats
path: root/src/components
diff options
context:
space:
mode:
authorLibravatar Vijay A <avijayr@protonmail.com>2021-08-10 07:52:45 +0530
committerLibravatar Vijay A <avijayr@protonmail.com>2021-08-10 07:52:45 +0530
commitcfaa5ee25c094a96e106ce0bf657f8cd6a59b867 (patch)
treef3bc6623e181d849440339ad84b01a285a8b4c5a /src/components
parent5.6.1-nightly.20 [skip ci] (diff)
downloadferdium-app-cfaa5ee25c094a96e106ce0bf657f8cd6a59b867.tar.gz
ferdium-app-cfaa5ee25c094a96e106ce0bf657f8cd6a59b867.tar.zst
ferdium-app-cfaa5ee25c094a96e106ce0bf657f8cd6a59b867.zip
refactor: Use symbols for key shortcuts
Diffstat (limited to 'src/components')
-rw-r--r--src/components/layout/Sidebar.js6
-rw-r--r--src/components/settings/settings/EditSettingsForm.js6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 008143a99..14ab21fb5 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -6,7 +6,7 @@ import { inject, observer } from 'mobx-react';
6import { Link } from 'react-router'; 6import { Link } from 'react-router';
7 7
8import Tabbar from '../services/tabs/Tabbar'; 8import Tabbar from '../services/tabs/Tabbar';
9import { ctrlKey, isMac } from '../../environment'; 9import { ctrlKey, isMac, shiftKey } from '../../environment';
10import { workspaceStore } from '../../features/workspaces'; 10import { workspaceStore } from '../../features/workspaces';
11import { todosStore } from '../../features/todos'; 11import { todosStore } from '../../features/todos';
12import { todoActions } from '../../features/todos/actions'; 12import { todoActions } from '../../features/todos/actions';
@@ -151,7 +151,7 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
151 }, 151 },
152 }); 152 });
153 }} 153 }}
154 data-tip={`${intl.formatMessage(messages.lockFerdi)} (${ctrlKey}+Shift+L)`} 154 data-tip={`${intl.formatMessage(messages.lockFerdi)} (${ctrlKey}+${shiftKey}+L)`}
155 > 155 >
156 <i className="mdi mdi-lock" /> 156 <i className="mdi mdi-lock" />
157 </button> 157 </button>
@@ -190,7 +190,7 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
190 this.updateToolTip(); 190 this.updateToolTip();
191 }} 191 }}
192 className={`sidebar__button sidebar__button--audio ${isAppMuted ? 'is-muted' : ''}`} 192 className={`sidebar__button sidebar__button--audio ${isAppMuted ? 'is-muted' : ''}`}
193 data-tip={`${intl.formatMessage(isAppMuted ? messages.unmute : messages.mute)} (${ctrlKey}+Shift+M)`} 193 data-tip={`${intl.formatMessage(isAppMuted ? messages.unmute : messages.mute)} (${ctrlKey}+${shiftKey}+M)`}
194 > 194 >
195 <i className={`mdi mdi-bell${isAppMuted ? '-off' : ''}`} /> 195 <i className={`mdi mdi-bell${isAppMuted ? '-off' : ''}`} />
196 </button> 196 </button>
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index e9ea97d1f..a4381e37d 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -16,7 +16,7 @@ import {
16 FRANZ_TRANSLATION, 16 FRANZ_TRANSLATION,
17 GITHUB_FRANZ_URL, 17 GITHUB_FRANZ_URL,
18} from '../../../config'; 18} from '../../../config';
19import { DEFAULT_APP_SETTINGS, isMac, isWindows } from '../../../environment'; 19import { cmdKey, shiftKey, DEFAULT_APP_SETTINGS, isMac, isWindows } from '../../../environment';
20import globalMessages from '../../../i18n/globalMessages'; 20import globalMessages from '../../../i18n/globalMessages';
21 21
22const messages = defineMessages({ 22const messages = defineMessages({
@@ -54,7 +54,7 @@ const messages = defineMessages({
54 }, 54 },
55 lockInfo: { 55 lockInfo: {
56 id: 'settings.app.lockInfo', 56 id: 'settings.app.lockInfo',
57 defaultMessage: '!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.', 57 defaultMessage: '!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.',
58 }, 58 },
59 scheduledDNDTimeInfo: { 59 scheduledDNDTimeInfo: {
60 id: 'settings.app.scheduledDNDTimeInfo', 60 id: 'settings.app.scheduledDNDTimeInfo',
@@ -548,7 +548,7 @@ export default @observer class EditSettingsForm extends Component {
548 }} 548 }}
549 > 549 >
550 <span> 550 <span>
551 { intl.formatMessage(messages.lockInfo) } 551 { intl.formatMessage(messages.lockInfo, { lockShortcut: `${cmdKey}+${shiftKey}+L` }) }
552 </span> 552 </span>
553 </p> 553 </p>
554 </div> 554 </div>