diff options
author | Romain <46404814+yourcontact@users.noreply.github.com> | 2020-04-09 10:28:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-09 09:28:07 +0100 |
commit | f013899bd27a7072f384e9c49e2179c2d61e99f8 (patch) | |
tree | 95462334bbc15e267a6456df878e050e9d1171ee /src/containers/settings/EditSettingsScreen.js | |
parent | Add support for Adaptable Dark Mode on Windows (#548) (diff) | |
download | ferdium-app-f013899bd27a7072f384e9c49e2179c2d61e99f8.tar.gz ferdium-app-f013899bd27a7072f384e9c49e2179c2d61e99f8.tar.zst ferdium-app-f013899bd27a7072f384e9c49e2179c2d61e99f8.zip |
Refactor updates settings (#506)
* Reorder updates toggle buttons
* Updated 'Disable updates' message to 'Enable automatic updates'
* Update 'noUpdates' to 'automaticUpdates'
* Update 'noUpdates' to 'automaticUpdates'
* Add condition for 'Include beta version' to show
* Enable automatic updates by default
* Update file so when automaticUpdates is true automatic updates are enabled
* Fix conditions with enableUpdate
* Apply code style
* Fix wrong condition with enableUpdate
* Delete unsued variable 'server'
* Apply style code
* Commit changes to submodule 'recipes'
* Update default message to 'Enable updates' from 'Disable updates'
* Update text to 'Enable updates' from 'Enable automatic update'
* Add migration for updates settings
* Update default messages to 'Enable updates' from 'Disable updates'
* Remove empty line
* Check for updates was disabled when updates were enabled
* Avoid superfluous break line when updates are disabled
* Add fragments to up-to-date message
* Add fragments to up-to-date message
* Remove file from previous commit
* Remove extra line
* Add 'Show draggable area on window' to en-US.json file
* Apply prepare-code script changes
Co-authored-by: Amine <amine@mouafik.fr>
Diffstat (limited to 'src/containers/settings/EditSettingsScreen.js')
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 4c99de9da..74ec1909e 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -162,9 +162,9 @@ const messages = defineMessages({ | |||
162 | id: 'settings.app.form.beta', | 162 | id: 'settings.app.form.beta', |
163 | defaultMessage: '!!!Include beta versions', | 163 | defaultMessage: '!!!Include beta versions', |
164 | }, | 164 | }, |
165 | noUpdates: { | 165 | automaticUpdates: { |
166 | id: 'settings.app.form.noUpdates', | 166 | id: 'settings.app.form.automaticUpdates', |
167 | defaultMessage: '!!!Disable updates', | 167 | defaultMessage: '!!!Enable updates', |
168 | }, | 168 | }, |
169 | enableTodos: { | 169 | enableTodos: { |
170 | id: 'settings.app.form.enableTodos', | 170 | id: 'settings.app.form.enableTodos', |
@@ -231,14 +231,14 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
231 | enableSpellchecking: settingsData.enableSpellchecking, | 231 | enableSpellchecking: settingsData.enableSpellchecking, |
232 | spellcheckerLanguage: settingsData.spellcheckerLanguage, | 232 | spellcheckerLanguage: settingsData.spellcheckerLanguage, |
233 | beta: settingsData.beta, // we need this info in the main process as well | 233 | beta: settingsData.beta, // we need this info in the main process as well |
234 | noUpdates: settingsData.noUpdates, // we need this info in the main process as well | 234 | automaticUpdates: settingsData.automaticUpdates, // we need this info in the main process as well |
235 | locale: settingsData.locale, // we need this info in the main process as well | 235 | locale: settingsData.locale, // we need this info in the main process as well |
236 | }, | 236 | }, |
237 | }); | 237 | }); |
238 | 238 | ||
239 | user.update({ | 239 | user.update({ |
240 | userData: { | 240 | userData: { |
241 | noUpdates: settingsData.noUpdates, | 241 | automaticUpdates: settingsData.automaticUpdates, |
242 | beta: settingsData.beta, | 242 | beta: settingsData.beta, |
243 | locale: settingsData.locale, | 243 | locale: settingsData.locale, |
244 | }, | 244 | }, |
@@ -491,10 +491,10 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
491 | value: user.data.beta, | 491 | value: user.data.beta, |
492 | default: DEFAULT_APP_SETTINGS.beta, | 492 | default: DEFAULT_APP_SETTINGS.beta, |
493 | }, | 493 | }, |
494 | noUpdates: { | 494 | automaticUpdates: { |
495 | label: intl.formatMessage(messages.noUpdates), | 495 | label: intl.formatMessage(messages.automaticUpdates), |
496 | value: settings.app.noUpdates, | 496 | value: settings.app.automaticUpdates, |
497 | default: DEFAULT_APP_SETTINGS.noUpdates, | 497 | default: DEFAULT_APP_SETTINGS.automaticUpdates, |
498 | }, | 498 | }, |
499 | }, | 499 | }, |
500 | }; | 500 | }; |
@@ -556,7 +556,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
556 | isTodosEnabled={todos.isFeatureActive} | 556 | isTodosEnabled={todos.isFeatureActive} |
557 | isWorkspaceEnabled={workspaces.isFeatureActive} | 557 | isWorkspaceEnabled={workspaces.isFeatureActive} |
558 | lockingFeatureEnabled={lockingFeatureEnabled} | 558 | lockingFeatureEnabled={lockingFeatureEnabled} |
559 | noUpdates={this.props.stores.settings.app.noUpdates} | 559 | automaticUpdates={this.props.stores.settings.app.automaticUpdates} |
560 | hibernationEnabled={this.props.stores.settings.app.hibernate} | 560 | hibernationEnabled={this.props.stores.settings.app.hibernate} |
561 | isDarkmodeEnabled={this.props.stores.settings.app.darkMode} | 561 | isDarkmodeEnabled={this.props.stores.settings.app.darkMode} |
562 | isAdaptableDarkModeEnabled={this.props.stores.settings.app.adaptableDarkMode} | 562 | isAdaptableDarkModeEnabled={this.props.stores.settings.app.adaptableDarkMode} |