diff options
author | 2020-03-29 16:20:44 +0100 | |
---|---|---|
committer | 2020-03-29 16:21:49 +0100 | |
commit | 56a7085adca22cb32ea318f199a7e8ee60b4797f (patch) | |
tree | 5826fcb9ee5c6347f4ea9eecc107ef378137ed03 | |
parent | Remove server setting from settings screen (diff) | |
download | ferdium-app-56a7085adca22cb32ea318f199a7e8ee60b4797f.tar.gz ferdium-app-56a7085adca22cb32ea318f199a7e8ee60b4797f.tar.zst ferdium-app-56a7085adca22cb32ea318f199a7e8ee60b4797f.zip |
Clean up unused locales and props
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 12 | ||||
-rw-r--r-- | src/i18n/messages/src/containers/settings/EditSettingsScreen.json | 105 |
2 files changed, 47 insertions, 70 deletions
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'; | |||
20 | import EditSettingsForm from '../../components/settings/settings/EditSettingsForm'; | 20 | import EditSettingsForm from '../../components/settings/settings/EditSettingsForm'; |
21 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 21 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
22 | 22 | ||
23 | import { API, TODOS_FRONTEND } from '../../environment'; | 23 | import { TODOS_FRONTEND } from '../../environment'; |
24 | 24 | ||
25 | import globalMessages from '../../i18n/globalMessages'; | 25 | import globalMessages from '../../i18n/globalMessages'; |
26 | import { DEFAULT_IS_FEATURE_ENABLED_BY_USER } from '../../features/todos'; | 26 | import { DEFAULT_IS_FEATURE_ENABLED_BY_USER } from '../../features/todos'; |
@@ -76,10 +76,6 @@ const messages = defineMessages({ | |||
76 | id: 'settings.app.form.hibernationStrategy', | 76 | id: 'settings.app.form.hibernationStrategy', |
77 | defaultMessage: '!!!Hibernation strategy', | 77 | defaultMessage: '!!!Hibernation strategy', |
78 | }, | 78 | }, |
79 | server: { | ||
80 | id: 'settings.app.form.server', | ||
81 | defaultMessage: '!!!Server', | ||
82 | }, | ||
83 | todoServer: { | 79 | todoServer: { |
84 | id: 'settings.app.form.todoServer', | 80 | id: 'settings.app.form.todoServer', |
85 | defaultMessage: '!!!Todo Server', | 81 | defaultMessage: '!!!Todo Server', |
@@ -207,7 +203,6 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
207 | sentry: settingsData.sentry, | 203 | sentry: settingsData.sentry, |
208 | hibernate: settingsData.hibernate, | 204 | hibernate: settingsData.hibernate, |
209 | hibernationStrategy: settingsData.hibernationStrategy, | 205 | hibernationStrategy: settingsData.hibernationStrategy, |
210 | server: settingsData.server, | ||
211 | todoServer: settingsData.todoServer, | 206 | todoServer: settingsData.todoServer, |
212 | lockingFeatureEnabled: settingsData.lockingFeatureEnabled, | 207 | lockingFeatureEnabled: settingsData.lockingFeatureEnabled, |
213 | lockedPassword: settingsData.lockedPassword, | 208 | lockedPassword: settingsData.lockedPassword, |
@@ -359,11 +354,6 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
359 | options: hibernationStrategies, | 354 | options: hibernationStrategies, |
360 | default: DEFAULT_APP_SETTINGS.hibernationStrategy, | 355 | default: DEFAULT_APP_SETTINGS.hibernationStrategy, |
361 | }, | 356 | }, |
362 | server: { | ||
363 | label: intl.formatMessage(messages.server), | ||
364 | value: settings.all.app.server || API, | ||
365 | default: API, | ||
366 | }, | ||
367 | todoServer: { | 357 | todoServer: { |
368 | label: intl.formatMessage(messages.todoServer), | 358 | label: intl.formatMessage(messages.todoServer), |
369 | value: settings.all.app.todoServer, | 359 | 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 | |||
@@ -156,28 +156,15 @@ | |||
156 | } | 156 | } |
157 | }, | 157 | }, |
158 | { | 158 | { |
159 | "id": "settings.app.form.server", | ||
160 | "defaultMessage": "!!!Server", | ||
161 | "file": "src/containers/settings/EditSettingsScreen.js", | ||
162 | "start": { | ||
163 | "line": 79, | ||
164 | "column": 10 | ||
165 | }, | ||
166 | "end": { | ||
167 | "line": 82, | ||
168 | "column": 3 | ||
169 | } | ||
170 | }, | ||
171 | { | ||
172 | "id": "settings.app.form.todoServer", | 159 | "id": "settings.app.form.todoServer", |
173 | "defaultMessage": "!!!Todo Server", | 160 | "defaultMessage": "!!!Todo Server", |
174 | "file": "src/containers/settings/EditSettingsScreen.js", | 161 | "file": "src/containers/settings/EditSettingsScreen.js", |
175 | "start": { | 162 | "start": { |
176 | "line": 83, | 163 | "line": 79, |
177 | "column": 14 | 164 | "column": 14 |
178 | }, | 165 | }, |
179 | "end": { | 166 | "end": { |
180 | "line": 86, | 167 | "line": 82, |
181 | "column": 3 | 168 | "column": 3 |
182 | } | 169 | } |
183 | }, | 170 | }, |
@@ -186,11 +173,11 @@ | |||
186 | "defaultMessage": "!!!Enable Password Lock", | 173 | "defaultMessage": "!!!Enable Password Lock", |
187 | "file": "src/containers/settings/EditSettingsScreen.js", | 174 | "file": "src/containers/settings/EditSettingsScreen.js", |
188 | "start": { | 175 | "start": { |
189 | "line": 87, | 176 | "line": 83, |
190 | "column": 14 | 177 | "column": 14 |
191 | }, | 178 | }, |
192 | "end": { | 179 | "end": { |
193 | "line": 90, | 180 | "line": 86, |
194 | "column": 3 | 181 | "column": 3 |
195 | } | 182 | } |
196 | }, | 183 | }, |
@@ -199,11 +186,11 @@ | |||
199 | "defaultMessage": "!!!Password", | 186 | "defaultMessage": "!!!Password", |
200 | "file": "src/containers/settings/EditSettingsScreen.js", | 187 | "file": "src/containers/settings/EditSettingsScreen.js", |
201 | "start": { | 188 | "start": { |
202 | "line": 91, | 189 | "line": 87, |
203 | "column": 16 | 190 | "column": 16 |
204 | }, | 191 | }, |
205 | "end": { | 192 | "end": { |
206 | "line": 94, | 193 | "line": 90, |
207 | "column": 3 | 194 | "column": 3 |
208 | } | 195 | } |
209 | }, | 196 | }, |
@@ -212,11 +199,11 @@ | |||
212 | "defaultMessage": "!!!Allow using Touch ID to unlock", | 199 | "defaultMessage": "!!!Allow using Touch ID to unlock", |
213 | "file": "src/containers/settings/EditSettingsScreen.js", | 200 | "file": "src/containers/settings/EditSettingsScreen.js", |
214 | "start": { | 201 | "start": { |
215 | "line": 95, | 202 | "line": 91, |
216 | "column": 22 | 203 | "column": 22 |
217 | }, | 204 | }, |
218 | "end": { | 205 | "end": { |
219 | "line": 98, | 206 | "line": 94, |
220 | "column": 3 | 207 | "column": 3 |
221 | } | 208 | } |
222 | }, | 209 | }, |
@@ -225,11 +212,11 @@ | |||
225 | "defaultMessage": "!!!Lock after inactivity", | 212 | "defaultMessage": "!!!Lock after inactivity", |
226 | "file": "src/containers/settings/EditSettingsScreen.js", | 213 | "file": "src/containers/settings/EditSettingsScreen.js", |
227 | "start": { | 214 | "start": { |
228 | "line": 99, | 215 | "line": 95, |
229 | "column": 18 | 216 | "column": 18 |
230 | }, | 217 | }, |
231 | "end": { | 218 | "end": { |
232 | "line": 102, | 219 | "line": 98, |
233 | "column": 3 | 220 | "column": 3 |
234 | } | 221 | } |
235 | }, | 222 | }, |
@@ -238,11 +225,11 @@ | |||
238 | "defaultMessage": "!!!Enable scheduled Do-not-Disturb", | 225 | "defaultMessage": "!!!Enable scheduled Do-not-Disturb", |
239 | "file": "src/containers/settings/EditSettingsScreen.js", | 226 | "file": "src/containers/settings/EditSettingsScreen.js", |
240 | "start": { | 227 | "start": { |
241 | "line": 103, | 228 | "line": 99, |
242 | "column": 23 | 229 | "column": 23 |
243 | }, | 230 | }, |
244 | "end": { | 231 | "end": { |
245 | "line": 106, | 232 | "line": 102, |
246 | "column": 3 | 233 | "column": 3 |
247 | } | 234 | } |
248 | }, | 235 | }, |
@@ -251,11 +238,11 @@ | |||
251 | "defaultMessage": "!!!From", | 238 | "defaultMessage": "!!!From", |
252 | "file": "src/containers/settings/EditSettingsScreen.js", | 239 | "file": "src/containers/settings/EditSettingsScreen.js", |
253 | "start": { | 240 | "start": { |
254 | "line": 107, | 241 | "line": 103, |
255 | "column": 21 | 242 | "column": 21 |
256 | }, | 243 | }, |
257 | "end": { | 244 | "end": { |
258 | "line": 110, | 245 | "line": 106, |
259 | "column": 3 | 246 | "column": 3 |
260 | } | 247 | } |
261 | }, | 248 | }, |
@@ -264,11 +251,11 @@ | |||
264 | "defaultMessage": "!!!To", | 251 | "defaultMessage": "!!!To", |
265 | "file": "src/containers/settings/EditSettingsScreen.js", | 252 | "file": "src/containers/settings/EditSettingsScreen.js", |
266 | "start": { | 253 | "start": { |
267 | "line": 111, | 254 | "line": 107, |
268 | "column": 19 | 255 | "column": 19 |
269 | }, | 256 | }, |
270 | "end": { | 257 | "end": { |
271 | "line": 114, | 258 | "line": 110, |
272 | "column": 3 | 259 | "column": 3 |
273 | } | 260 | } |
274 | }, | 261 | }, |
@@ -277,11 +264,11 @@ | |||
277 | "defaultMessage": "!!!Language", | 264 | "defaultMessage": "!!!Language", |
278 | "file": "src/containers/settings/EditSettingsScreen.js", | 265 | "file": "src/containers/settings/EditSettingsScreen.js", |
279 | "start": { | 266 | "start": { |
280 | "line": 115, | 267 | "line": 111, |
281 | "column": 12 | 268 | "column": 12 |
282 | }, | 269 | }, |
283 | "end": { | 270 | "end": { |
284 | "line": 118, | 271 | "line": 114, |
285 | "column": 3 | 272 | "column": 3 |
286 | } | 273 | } |
287 | }, | 274 | }, |
@@ -290,11 +277,11 @@ | |||
290 | "defaultMessage": "!!!Dark Mode", | 277 | "defaultMessage": "!!!Dark Mode", |
291 | "file": "src/containers/settings/EditSettingsScreen.js", | 278 | "file": "src/containers/settings/EditSettingsScreen.js", |
292 | "start": { | 279 | "start": { |
293 | "line": 119, | 280 | "line": 115, |
294 | "column": 12 | 281 | "column": 12 |
295 | }, | 282 | }, |
296 | "end": { | 283 | "end": { |
297 | "line": 122, | 284 | "line": 118, |
298 | "column": 3 | 285 | "column": 3 |
299 | } | 286 | } |
300 | }, | 287 | }, |
@@ -303,11 +290,11 @@ | |||
303 | "defaultMessage": "!!!Synchronize dark mode with my Mac's dark mode setting", | 290 | "defaultMessage": "!!!Synchronize dark mode with my Mac's dark mode setting", |
304 | "file": "src/containers/settings/EditSettingsScreen.js", | 291 | "file": "src/containers/settings/EditSettingsScreen.js", |
305 | "start": { | 292 | "start": { |
306 | "line": 123, | 293 | "line": 119, |
307 | "column": 21 | 294 | "column": 21 |
308 | }, | 295 | }, |
309 | "end": { | 296 | "end": { |
310 | "line": 126, | 297 | "line": 122, |
311 | "column": 3 | 298 | "column": 3 |
312 | } | 299 | } |
313 | }, | 300 | }, |
@@ -316,11 +303,11 @@ | |||
316 | "defaultMessage": "!!!Enable universal Dark Mode", | 303 | "defaultMessage": "!!!Enable universal Dark Mode", |
317 | "file": "src/containers/settings/EditSettingsScreen.js", | 304 | "file": "src/containers/settings/EditSettingsScreen.js", |
318 | "start": { | 305 | "start": { |
319 | "line": 127, | 306 | "line": 123, |
320 | "column": 21 | 307 | "column": 21 |
321 | }, | 308 | }, |
322 | "end": { | 309 | "end": { |
323 | "line": 130, | 310 | "line": 126, |
324 | "column": 3 | 311 | "column": 3 |
325 | } | 312 | } |
326 | }, | 313 | }, |
@@ -329,11 +316,11 @@ | |||
329 | "defaultMessage": "!!!Sidebar width", | 316 | "defaultMessage": "!!!Sidebar width", |
330 | "file": "src/containers/settings/EditSettingsScreen.js", | 317 | "file": "src/containers/settings/EditSettingsScreen.js", |
331 | "start": { | 318 | "start": { |
332 | "line": 131, | 319 | "line": 127, |
333 | "column": 22 | 320 | "column": 22 |
334 | }, | 321 | }, |
335 | "end": { | 322 | "end": { |
336 | "line": 134, | 323 | "line": 130, |
337 | "column": 3 | 324 | "column": 3 |
338 | } | 325 | } |
339 | }, | 326 | }, |
@@ -342,11 +329,11 @@ | |||
342 | "defaultMessage": "!!!Service icon size", | 329 | "defaultMessage": "!!!Service icon size", |
343 | "file": "src/containers/settings/EditSettingsScreen.js", | 330 | "file": "src/containers/settings/EditSettingsScreen.js", |
344 | "start": { | 331 | "start": { |
345 | "line": 135, | 332 | "line": 131, |
346 | "column": 12 | 333 | "column": 12 |
347 | }, | 334 | }, |
348 | "end": { | 335 | "end": { |
349 | "line": 138, | 336 | "line": 134, |
350 | "column": 3 | 337 | "column": 3 |
351 | } | 338 | } |
352 | }, | 339 | }, |
@@ -355,11 +342,11 @@ | |||
355 | "defaultMessage": "!!!Accent color", | 342 | "defaultMessage": "!!!Accent color", |
356 | "file": "src/containers/settings/EditSettingsScreen.js", | 343 | "file": "src/containers/settings/EditSettingsScreen.js", |
357 | "start": { | 344 | "start": { |
358 | "line": 139, | 345 | "line": 135, |
359 | "column": 15 | 346 | "column": 15 |
360 | }, | 347 | }, |
361 | "end": { | 348 | "end": { |
362 | "line": 142, | 349 | "line": 138, |
363 | "column": 3 | 350 | "column": 3 |
364 | } | 351 | } |
365 | }, | 352 | }, |
@@ -368,11 +355,11 @@ | |||
368 | "defaultMessage": "!!!Display disabled services tabs", | 355 | "defaultMessage": "!!!Display disabled services tabs", |
369 | "file": "src/containers/settings/EditSettingsScreen.js", | 356 | "file": "src/containers/settings/EditSettingsScreen.js", |
370 | "start": { | 357 | "start": { |
371 | "line": 143, | 358 | "line": 139, |
372 | "column": 24 | 359 | "column": 24 |
373 | }, | 360 | }, |
374 | "end": { | 361 | "end": { |
375 | "line": 146, | 362 | "line": 142, |
376 | "column": 3 | 363 | "column": 3 |
377 | } | 364 | } |
378 | }, | 365 | }, |
@@ -381,11 +368,11 @@ | |||
381 | "defaultMessage": "!!!Show unread message badge when notifications are disabled", | 368 | "defaultMessage": "!!!Show unread message badge when notifications are disabled", |
382 | "file": "src/containers/settings/EditSettingsScreen.js", | 369 | "file": "src/containers/settings/EditSettingsScreen.js", |
383 | "start": { | 370 | "start": { |
384 | "line": 147, | 371 | "line": 143, |
385 | "column": 29 | 372 | "column": 29 |
386 | }, | 373 | }, |
387 | "end": { | 374 | "end": { |
388 | "line": 150, | 375 | "line": 146, |
389 | "column": 3 | 376 | "column": 3 |
390 | } | 377 | } |
391 | }, | 378 | }, |
@@ -394,11 +381,11 @@ | |||
394 | "defaultMessage": "!!!Enable spell checking", | 381 | "defaultMessage": "!!!Enable spell checking", |
395 | "file": "src/containers/settings/EditSettingsScreen.js", | 382 | "file": "src/containers/settings/EditSettingsScreen.js", |
396 | "start": { | 383 | "start": { |
397 | "line": 151, | 384 | "line": 147, |
398 | "column": 23 | 385 | "column": 23 |
399 | }, | 386 | }, |
400 | "end": { | 387 | "end": { |
401 | "line": 154, | 388 | "line": 150, |
402 | "column": 3 | 389 | "column": 3 |
403 | } | 390 | } |
404 | }, | 391 | }, |
@@ -407,11 +394,11 @@ | |||
407 | "defaultMessage": "!!!Enable GPU Acceleration", | 394 | "defaultMessage": "!!!Enable GPU Acceleration", |
408 | "file": "src/containers/settings/EditSettingsScreen.js", | 395 | "file": "src/containers/settings/EditSettingsScreen.js", |
409 | "start": { | 396 | "start": { |
410 | "line": 155, | 397 | "line": 151, |
411 | "column": 25 | 398 | "column": 25 |
412 | }, | 399 | }, |
413 | "end": { | 400 | "end": { |
414 | "line": 158, | 401 | "line": 154, |
415 | "column": 3 | 402 | "column": 3 |
416 | } | 403 | } |
417 | }, | 404 | }, |
@@ -420,11 +407,11 @@ | |||
420 | "defaultMessage": "!!!Include beta versions", | 407 | "defaultMessage": "!!!Include beta versions", |
421 | "file": "src/containers/settings/EditSettingsScreen.js", | 408 | "file": "src/containers/settings/EditSettingsScreen.js", |
422 | "start": { | 409 | "start": { |
423 | "line": 159, | 410 | "line": 155, |
424 | "column": 8 | 411 | "column": 8 |
425 | }, | 412 | }, |
426 | "end": { | 413 | "end": { |
427 | "line": 162, | 414 | "line": 158, |
428 | "column": 3 | 415 | "column": 3 |
429 | } | 416 | } |
430 | }, | 417 | }, |
@@ -433,11 +420,11 @@ | |||
433 | "defaultMessage": "!!!Disable updates", | 420 | "defaultMessage": "!!!Disable updates", |
434 | "file": "src/containers/settings/EditSettingsScreen.js", | 421 | "file": "src/containers/settings/EditSettingsScreen.js", |
435 | "start": { | 422 | "start": { |
436 | "line": 163, | 423 | "line": 159, |
437 | "column": 13 | 424 | "column": 13 |
438 | }, | 425 | }, |
439 | "end": { | 426 | "end": { |
440 | "line": 166, | 427 | "line": 162, |
441 | "column": 3 | 428 | "column": 3 |
442 | } | 429 | } |
443 | }, | 430 | }, |
@@ -446,11 +433,11 @@ | |||
446 | "defaultMessage": "!!!Enable Franz Todos", | 433 | "defaultMessage": "!!!Enable Franz Todos", |
447 | "file": "src/containers/settings/EditSettingsScreen.js", | 434 | "file": "src/containers/settings/EditSettingsScreen.js", |
448 | "start": { | 435 | "start": { |
449 | "line": 167, | 436 | "line": 163, |
450 | "column": 15 | 437 | "column": 15 |
451 | }, | 438 | }, |
452 | "end": { | 439 | "end": { |
453 | "line": 170, | 440 | "line": 166, |
454 | "column": 3 | 441 | "column": 3 |
455 | } | 442 | } |
456 | }, | 443 | }, |
@@ -459,11 +446,11 @@ | |||
459 | "defaultMessage": "!!!Keep all workspaces loaded", | 446 | "defaultMessage": "!!!Keep all workspaces loaded", |
460 | "file": "src/containers/settings/EditSettingsScreen.js", | 447 | "file": "src/containers/settings/EditSettingsScreen.js", |
461 | "start": { | 448 | "start": { |
462 | "line": 171, | 449 | "line": 167, |
463 | "column": 27 | 450 | "column": 27 |
464 | }, | 451 | }, |
465 | "end": { | 452 | "end": { |
466 | "line": 174, | 453 | "line": 170, |
467 | "column": 3 | 454 | "column": 3 |
468 | } | 455 | } |
469 | } | 456 | } |