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/i18n/locales/en-US.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/i18n/locales/en-US.json') diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 7e46ddc6f..9f19ad742 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -277,6 +277,7 @@ "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", + "settings.app.form.automaticUpdates": "Enable updates", "settings.app.form.beta": "Include beta versions", "settings.app.form.customTodoServer": "Custom Todo Server", "settings.app.form.darkMode": "Enable dark mode", @@ -294,7 +295,6 @@ "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray", "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour", - "settings.app.form.noUpdates": "Disable updates", "settings.app.form.predefinedTodoServer": "Todo Server", "settings.app.form.privateNotifications": "Don't show message content in notifications", "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume", @@ -306,6 +306,7 @@ "settings.app.form.serviceRibbonWidth": "Sidebar width", "settings.app.form.showDisabledServices": "Display disabled services tabs", "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled", + "settings.app.form.showDragArea": "Show draggable area on window", "settings.app.form.startMinimized": "Start minimized", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", @@ -512,4 +513,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} -- cgit v1.2.3-70-g09d2