diff options
author | Amine El Mouafik <412895+kytwb@users.noreply.github.com> | 2021-02-08 10:34:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-08 10:34:45 +0100 |
commit | 035002ceedf78d5ec73eabc0df7f06139939b967 (patch) | |
tree | 1c0d1e9531bae05fb65d70b9ea25baf404b74fe1 /src/components/settings/services | |
parent | docs: add k0staa as a contributor (#1193) (diff) | |
download | ferdium-app-035002ceedf78d5ec73eabc0df7f06139939b967.tar.gz ferdium-app-035002ceedf78d5ec73eabc0df7f06139939b967.tar.zst ferdium-app-035002ceedf78d5ec73eabc0df7f06139939b967.zip |
Synchronize with Franz 5.6.0 (#1033)
Co-authored-by: FranzBot <i18n@meetfranz.com>
Co-authored-by: vantezzen <hello@vantezzen.io>
Co-authored-by: Makazzz <makazzzpro@live.ca>
Co-authored-by: Stefan Malzner <stefan@adlk.io>
Co-authored-by: Amine Mouafik <amine@mouafik.fr>
Diffstat (limited to 'src/components/settings/services')
-rw-r--r-- | src/components/settings/services/EditServiceForm.js | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index f1e70ce59..80f60b3e1 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js | |||
@@ -20,7 +20,6 @@ import Select from '../../ui/Select'; | |||
20 | import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer'; | 20 | import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer'; |
21 | import LimitReachedInfobox from '../../../features/serviceLimit/components/LimitReachedInfobox'; | 21 | import LimitReachedInfobox from '../../../features/serviceLimit/components/LimitReachedInfobox'; |
22 | import { serviceLimitStore } from '../../../features/serviceLimit'; | 22 | import { serviceLimitStore } from '../../../features/serviceLimit'; |
23 | |||
24 | import { isMac } from '../../../environment'; | 23 | import { isMac } from '../../../environment'; |
25 | 24 | ||
26 | const messages = defineMessages({ | 25 | const messages = defineMessages({ |
@@ -96,9 +95,9 @@ const messages = defineMessages({ | |||
96 | id: 'settings.service.form.isMutedInfo', | 95 | id: 'settings.service.form.isMutedInfo', |
97 | defaultMessage: '!!!When disabled, all notification sounds and audio playback are muted', | 96 | defaultMessage: '!!!When disabled, all notification sounds and audio playback are muted', |
98 | }, | 97 | }, |
99 | disableHibernationInfo: { | 98 | isHibernationEnabledInfo: { |
100 | id: 'settings.service.form.disableHibernationInfo', | 99 | id: 'settings.service.form.isHibernatedEnabledInfo', |
101 | defaultMessage: '!!!You currently have hibernation enabled but you can disable hibernation for individual services using this option.', | 100 | defaultMessage: '!!!When enabled, a service will be shut down after a period of time to save system resources.', |
102 | }, | 101 | }, |
103 | headlineNotifications: { | 102 | headlineNotifications: { |
104 | id: 'settings.service.form.headlineNotifications', | 103 | id: 'settings.service.form.headlineNotifications', |
@@ -375,9 +374,9 @@ export default @observer class EditServiceForm extends Component { | |||
375 | <Toggle field={form.$('isEnabled')} /> | 374 | <Toggle field={form.$('isEnabled')} /> |
376 | {isHibernationFeatureActive && ( | 375 | {isHibernationFeatureActive && ( |
377 | <> | 376 | <> |
378 | <Toggle field={form.$('disableHibernation')} /> | 377 | <Toggle field={form.$('isHibernationEnabled')} /> |
379 | <p className="settings__help"> | 378 | <p className="settings__help"> |
380 | {intl.formatMessage(messages.disableHibernationInfo)} | 379 | {intl.formatMessage(messages.isHibernationEnabledInfo)} |
381 | </p> | 380 | </p> |
382 | </> | 381 | </> |
383 | )} | 382 | )} |
@@ -409,7 +408,7 @@ export default @observer class EditServiceForm extends Component { | |||
409 | gaEventInfo={{ category: 'User', event: 'upgrade', label: 'spellchecker' }} | 408 | gaEventInfo={{ category: 'User', event: 'upgrade', label: 'spellchecker' }} |
410 | > | 409 | > |
411 | <div className="settings__settings-group"> | 410 | <div className="settings__settings-group"> |
412 | <Select field={form.$('spellcheckerLanguage')} multiple /> | 411 | <Select field={form.$('spellcheckerLanguage')} /> |
413 | </div> | 412 | </div> |
414 | </PremiumFeatureContainer> | 413 | </PremiumFeatureContainer> |
415 | )} | 414 | )} |