From 035002ceedf78d5ec73eabc0df7f06139939b967 Mon Sep 17 00:00:00 2001
From: Amine El Mouafik <412895+kytwb@users.noreply.github.com>
Date: Mon, 8 Feb 2021 10:34:45 +0100
Subject: 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>
---
 src/components/settings/services/EditServiceForm.js  | 13 ++++++-------
 src/components/settings/settings/EditSettingsForm.js | 14 +++++++++-----
 2 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'src/components/settings')

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';
 import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer';
 import LimitReachedInfobox from '../../../features/serviceLimit/components/LimitReachedInfobox';
 import { serviceLimitStore } from '../../../features/serviceLimit';
-
 import { isMac } from '../../../environment';
 
 const messages = defineMessages({
@@ -96,9 +95,9 @@ const messages = defineMessages({
     id: 'settings.service.form.isMutedInfo',
     defaultMessage: '!!!When disabled, all notification sounds and audio playback are muted',
   },
-  disableHibernationInfo: {
-    id: 'settings.service.form.disableHibernationInfo',
-    defaultMessage: '!!!You currently have hibernation enabled but you can disable hibernation for individual services using this option.',
+  isHibernationEnabledInfo: {
+    id: 'settings.service.form.isHibernatedEnabledInfo',
+    defaultMessage: '!!!When enabled, a service will be shut down after a period of time to save system resources.',
   },
   headlineNotifications: {
     id: 'settings.service.form.headlineNotifications',
@@ -375,9 +374,9 @@ export default @observer class EditServiceForm extends Component {
                   <Toggle field={form.$('isEnabled')} />
                   {isHibernationFeatureActive && (
                     <>
-                      <Toggle field={form.$('disableHibernation')} />
+                      <Toggle field={form.$('isHibernationEnabled')} />
                       <p className="settings__help">
-                        {intl.formatMessage(messages.disableHibernationInfo)}
+                        {intl.formatMessage(messages.isHibernationEnabledInfo)}
                       </p>
                     </>
                   )}
@@ -409,7 +408,7 @@ export default @observer class EditServiceForm extends Component {
                 gaEventInfo={{ category: 'User', event: 'upgrade', label: 'spellchecker' }}
               >
                 <div className="settings__settings-group">
-                  <Select field={form.$('spellcheckerLanguage')} multiple />
+                  <Select field={form.$('spellcheckerLanguage')} />
                 </div>
               </PremiumFeatureContainer>
             )}
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index cd772214f..f20c38bc9 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -173,6 +173,8 @@ export default @observer class EditSettingsForm extends Component {
     isAdaptableDarkModeEnabled: PropTypes.bool.isRequired,
     isNightlyEnabled: PropTypes.bool.isRequired,
     openProcessManager: PropTypes.func.isRequired,
+    hasAddedTodosAsService: PropTypes.bool.isRequired,
+    isOnline: PropTypes.bool.isRequired,
   };
 
   static contextTypes = {
@@ -227,6 +229,8 @@ export default @observer class EditSettingsForm extends Component {
       openProcessManager,
       isTodosActivated,
       isNightlyEnabled,
+      hasAddedTodosAsService,
+      isOnline,
     } = this.props;
     const { intl } = this.context;
 
@@ -346,7 +350,7 @@ export default @observer class EditSettingsForm extends Component {
 
                 <Hr />
 
-                {isTodosEnabled && (
+                {isTodosEnabled && !hasAddedTodosAsService && (
                   <>
                     <Toggle field={form.$('enableTodos')} />
                     {isTodosActivated && (
@@ -535,10 +539,10 @@ export default @observer class EditSettingsForm extends Component {
                     <Toggle
                       field={form.$('enableSpellchecking')}
                     />
-                    {form.$('enableSpellchecking').value && !isMac && (
-                      <Select field={form.$('spellcheckerLanguage')} multiple />
+                    {!isMac && form.$('enableSpellchecking').value && (
+                      <Select field={form.$('spellcheckerLanguage')} />
                     )}
-                    {form.$('enableSpellchecking').value && isMac && (
+                    {isMac && form.$('enableSpellchecking').value && (
                       <p>{intl.formatMessage(messages.spellCheckerLanguageInfo)}</p>
                     )}
                   </Fragment>
@@ -625,7 +629,7 @@ export default @observer class EditSettingsForm extends Component {
                     buttonType="secondary"
                     label={intl.formatMessage(updateButtonLabelMessage)}
                     onClick={checkForUpdates}
-                    disabled={!automaticUpdates || isCheckingForUpdates || isUpdateAvailable}
+                    disabled={!automaticUpdates || isCheckingForUpdates || isUpdateAvailable || !isOnline}
                     loaded={!isCheckingForUpdates || !isUpdateAvailable}
                   />
                 )}
-- 
cgit v1.2.3-54-g00ecf