From 5893fd4fe7a97448d4edd38761aa10f17014d04c Mon Sep 17 00:00:00 2001 From: Marouane Rassili Date: Sun, 29 Mar 2020 12:20:44 +0100 Subject: Remove server setting from settings screen --- src/containers/settings/EditSettingsScreen.js | 1 - 1 file changed, 1 deletion(-) (limited to 'src/containers/settings') diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 5221b0694..ffefdda77 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js @@ -541,7 +541,6 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e isSpellcheckerIncludedInCurrentPlan={spellcheckerConfig.isIncludedInCurrentPlan} isTodosEnabled={todos.isFeatureActive} isWorkspaceEnabled={workspaces.isFeatureActive} - server={this.props.stores.settings.app.server} lockingFeatureEnabled={lockingFeatureEnabled} noUpdates={this.props.stores.settings.app.noUpdates} hibernationEnabled={this.props.stores.settings.app.hibernate} -- cgit v1.2.3-70-g09d2 From 56a7085adca22cb32ea318f199a7e8ee60b4797f Mon Sep 17 00:00:00 2001 From: Marouane Rassili Date: Sun, 29 Mar 2020 16:20:44 +0100 Subject: Clean up unused locales and props --- src/containers/settings/EditSettingsScreen.js | 12 +-- .../containers/settings/EditSettingsScreen.json | 105 +++++++++------------ 2 files changed, 47 insertions(+), 70 deletions(-) (limited to 'src/containers/settings') diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index ffefdda77..be251aa8b 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js @@ -20,7 +20,7 @@ import { getSelectOptions } from '../../helpers/i18n-helpers'; import EditSettingsForm from '../../components/settings/settings/EditSettingsForm'; import ErrorBoundary from '../../components/util/ErrorBoundary'; -import { API, TODOS_FRONTEND } from '../../environment'; +import { TODOS_FRONTEND } from '../../environment'; import globalMessages from '../../i18n/globalMessages'; import { DEFAULT_IS_FEATURE_ENABLED_BY_USER } from '../../features/todos'; @@ -76,10 +76,6 @@ const messages = defineMessages({ id: 'settings.app.form.hibernationStrategy', defaultMessage: '!!!Hibernation strategy', }, - server: { - id: 'settings.app.form.server', - defaultMessage: '!!!Server', - }, todoServer: { id: 'settings.app.form.todoServer', defaultMessage: '!!!Todo Server', @@ -207,7 +203,6 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e sentry: settingsData.sentry, hibernate: settingsData.hibernate, hibernationStrategy: settingsData.hibernationStrategy, - server: settingsData.server, todoServer: settingsData.todoServer, lockingFeatureEnabled: settingsData.lockingFeatureEnabled, lockedPassword: settingsData.lockedPassword, @@ -359,11 +354,6 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e options: hibernationStrategies, default: DEFAULT_APP_SETTINGS.hibernationStrategy, }, - server: { - label: intl.formatMessage(messages.server), - value: settings.all.app.server || API, - default: API, - }, todoServer: { label: intl.formatMessage(messages.todoServer), value: settings.all.app.todoServer, diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json index 0d3265c51..6777a0d83 100644 --- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json +++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json @@ -155,29 +155,16 @@ "column": 3 } }, - { - "id": "settings.app.form.server", - "defaultMessage": "!!!Server", - "file": "src/containers/settings/EditSettingsScreen.js", - "start": { - "line": 79, - "column": 10 - }, - "end": { - "line": 82, - "column": 3 - } - }, { "id": "settings.app.form.todoServer", "defaultMessage": "!!!Todo Server", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 83, + "line": 79, "column": 14 }, "end": { - "line": 86, + "line": 82, "column": 3 } }, @@ -186,11 +173,11 @@ "defaultMessage": "!!!Enable Password Lock", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 87, + "line": 83, "column": 14 }, "end": { - "line": 90, + "line": 86, "column": 3 } }, @@ -199,11 +186,11 @@ "defaultMessage": "!!!Password", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 91, + "line": 87, "column": 16 }, "end": { - "line": 94, + "line": 90, "column": 3 } }, @@ -212,11 +199,11 @@ "defaultMessage": "!!!Allow using Touch ID to unlock", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 95, + "line": 91, "column": 22 }, "end": { - "line": 98, + "line": 94, "column": 3 } }, @@ -225,11 +212,11 @@ "defaultMessage": "!!!Lock after inactivity", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 99, + "line": 95, "column": 18 }, "end": { - "line": 102, + "line": 98, "column": 3 } }, @@ -238,11 +225,11 @@ "defaultMessage": "!!!Enable scheduled Do-not-Disturb", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 103, + "line": 99, "column": 23 }, "end": { - "line": 106, + "line": 102, "column": 3 } }, @@ -251,11 +238,11 @@ "defaultMessage": "!!!From", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 107, + "line": 103, "column": 21 }, "end": { - "line": 110, + "line": 106, "column": 3 } }, @@ -264,11 +251,11 @@ "defaultMessage": "!!!To", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 111, + "line": 107, "column": 19 }, "end": { - "line": 114, + "line": 110, "column": 3 } }, @@ -277,11 +264,11 @@ "defaultMessage": "!!!Language", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 115, + "line": 111, "column": 12 }, "end": { - "line": 118, + "line": 114, "column": 3 } }, @@ -290,11 +277,11 @@ "defaultMessage": "!!!Dark Mode", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 119, + "line": 115, "column": 12 }, "end": { - "line": 122, + "line": 118, "column": 3 } }, @@ -303,11 +290,11 @@ "defaultMessage": "!!!Synchronize dark mode with my Mac's dark mode setting", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 123, + "line": 119, "column": 21 }, "end": { - "line": 126, + "line": 122, "column": 3 } }, @@ -316,11 +303,11 @@ "defaultMessage": "!!!Enable universal Dark Mode", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 127, + "line": 123, "column": 21 }, "end": { - "line": 130, + "line": 126, "column": 3 } }, @@ -329,11 +316,11 @@ "defaultMessage": "!!!Sidebar width", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 131, + "line": 127, "column": 22 }, "end": { - "line": 134, + "line": 130, "column": 3 } }, @@ -342,11 +329,11 @@ "defaultMessage": "!!!Service icon size", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 135, + "line": 131, "column": 12 }, "end": { - "line": 138, + "line": 134, "column": 3 } }, @@ -355,11 +342,11 @@ "defaultMessage": "!!!Accent color", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 139, + "line": 135, "column": 15 }, "end": { - "line": 142, + "line": 138, "column": 3 } }, @@ -368,11 +355,11 @@ "defaultMessage": "!!!Display disabled services tabs", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 143, + "line": 139, "column": 24 }, "end": { - "line": 146, + "line": 142, "column": 3 } }, @@ -381,11 +368,11 @@ "defaultMessage": "!!!Show unread message badge when notifications are disabled", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 147, + "line": 143, "column": 29 }, "end": { - "line": 150, + "line": 146, "column": 3 } }, @@ -394,11 +381,11 @@ "defaultMessage": "!!!Enable spell checking", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 151, + "line": 147, "column": 23 }, "end": { - "line": 154, + "line": 150, "column": 3 } }, @@ -407,11 +394,11 @@ "defaultMessage": "!!!Enable GPU Acceleration", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 155, + "line": 151, "column": 25 }, "end": { - "line": 158, + "line": 154, "column": 3 } }, @@ -420,11 +407,11 @@ "defaultMessage": "!!!Include beta versions", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 159, + "line": 155, "column": 8 }, "end": { - "line": 162, + "line": 158, "column": 3 } }, @@ -433,11 +420,11 @@ "defaultMessage": "!!!Disable updates", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 163, + "line": 159, "column": 13 }, "end": { - "line": 166, + "line": 162, "column": 3 } }, @@ -446,11 +433,11 @@ "defaultMessage": "!!!Enable Franz Todos", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 167, + "line": 163, "column": 15 }, "end": { - "line": 170, + "line": 166, "column": 3 } }, @@ -459,11 +446,11 @@ "defaultMessage": "!!!Keep all workspaces loaded", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 171, + "line": 167, "column": 27 }, "end": { - "line": 174, + "line": 170, "column": 3 } } -- cgit v1.2.3-70-g09d2