From f013899bd27a7072f384e9c49e2179c2d61e99f8 Mon Sep 17 00:00:00 2001 From: Romain <46404814+yourcontact@users.noreply.github.com> Date: Thu, 9 Apr 2020 10:28:07 +0200 Subject: 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 --- src/containers/settings/EditSettingsScreen.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/containers/settings/EditSettingsScreen.js') 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({ id: 'settings.app.form.beta', defaultMessage: '!!!Include beta versions', }, - noUpdates: { - id: 'settings.app.form.noUpdates', - defaultMessage: '!!!Disable updates', + automaticUpdates: { + id: 'settings.app.form.automaticUpdates', + defaultMessage: '!!!Enable updates', }, enableTodos: { id: 'settings.app.form.enableTodos', @@ -231,14 +231,14 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e enableSpellchecking: settingsData.enableSpellchecking, spellcheckerLanguage: settingsData.spellcheckerLanguage, beta: settingsData.beta, // we need this info in the main process as well - noUpdates: settingsData.noUpdates, // we need this info in the main process as well + automaticUpdates: settingsData.automaticUpdates, // we need this info in the main process as well locale: settingsData.locale, // we need this info in the main process as well }, }); user.update({ userData: { - noUpdates: settingsData.noUpdates, + automaticUpdates: settingsData.automaticUpdates, beta: settingsData.beta, locale: settingsData.locale, }, @@ -491,10 +491,10 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e value: user.data.beta, default: DEFAULT_APP_SETTINGS.beta, }, - noUpdates: { - label: intl.formatMessage(messages.noUpdates), - value: settings.app.noUpdates, - default: DEFAULT_APP_SETTINGS.noUpdates, + automaticUpdates: { + label: intl.formatMessage(messages.automaticUpdates), + value: settings.app.automaticUpdates, + default: DEFAULT_APP_SETTINGS.automaticUpdates, }, }, }; @@ -556,7 +556,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e isTodosEnabled={todos.isFeatureActive} isWorkspaceEnabled={workspaces.isFeatureActive} lockingFeatureEnabled={lockingFeatureEnabled} - noUpdates={this.props.stores.settings.app.noUpdates} + automaticUpdates={this.props.stores.settings.app.automaticUpdates} hibernationEnabled={this.props.stores.settings.app.hibernate} isDarkmodeEnabled={this.props.stores.settings.app.darkMode} isAdaptableDarkModeEnabled={this.props.stores.settings.app.adaptableDarkMode} -- cgit v1.2.3-54-g00ecf