From 0d6d623d1e34cdbff2d46229165b49289a9a0619 Mon Sep 17 00:00:00 2001 From: Bennett Date: Sun, 21 Jun 2020 09:19:59 +0200 Subject: Add FAB to service dashboard (#824) * Implement #387 * Fix lint * Upgrade to Electron 9 * Remove dependency on electron-spellchecker * Allow multiple languages to be selected * Fix lint * Don't show spellchecker language chooser for macOS * Fix _requireAuthenticatedUser throwing error on startup * Add FAB --- src/components/settings/services/EditServiceForm.js | 20 ++++++++++++-------- .../settings/services/ServicesDashboard.js | 7 +++++++ src/components/settings/settings/EditSettingsForm.js | 11 +++++++++-- 3 files changed, 28 insertions(+), 10 deletions(-) (limited to 'src/components/settings') diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index 3dba793b2..f1e70ce59 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js @@ -21,6 +21,8 @@ import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer'; import LimitReachedInfobox from '../../../features/serviceLimit/components/LimitReachedInfobox'; import { serviceLimitStore } from '../../../features/serviceLimit'; +import { isMac } from '../../../environment'; + const messages = defineMessages({ saveService: { id: 'settings.service.form.saveButton', @@ -401,14 +403,16 @@ export default @observer class EditServiceForm extends Component { - -
- +
+
+ )} {isProxyFeatureEnabled && ( )} + + + + + + + ); diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 50358c36f..ba7cb7317 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -91,6 +91,10 @@ const messages = defineMessages({ id: 'settings.app.translationHelp', defaultMessage: '!!!Help us to translate Ferdi into your language.', }, + spellCheckerLanguageInfo: { + id: 'settings.app.spellCheckerLanguageInfo', + defaultMessage: '!!!Ferdi uses your Mac\'s build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac\'s System Preferences.', + }, subheadlineCache: { id: 'settings.app.subheadlineCache', defaultMessage: '!!!Cache', @@ -518,8 +522,11 @@ export default @observer class EditSettingsForm extends Component { - {form.$('enableSpellchecking').value && ( - + )} + {form.$('enableSpellchecking').value && isMac && ( +

{intl.formatMessage(messages.spellCheckerLanguageInfo)}

)}
-- cgit v1.2.3-54-g00ecf