diff options
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/settings/EditServiceScreen.js | 5 | ||||
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js index 9a200d734..77548bdcf 100644 --- a/src/containers/settings/EditServiceScreen.js +++ b/src/containers/settings/EditServiceScreen.js | |||
@@ -219,6 +219,11 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex | |||
219 | options: spellcheckerLanguage, | 219 | options: spellcheckerLanguage, |
220 | disabled: !stores.settings.app.enableSpellchecking, | 220 | disabled: !stores.settings.app.enableSpellchecking, |
221 | }, | 221 | }, |
222 | userAgentPref: { | ||
223 | label: intl.formatMessage(globalMessages.userAgentPref), | ||
224 | placeholder: service.defaultUserAgent, | ||
225 | value: service.userAgentPref ? service.userAgentPref : '', | ||
226 | }, | ||
222 | }, | 227 | }, |
223 | }; | 228 | }; |
224 | 229 | ||
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index a5dc427ba..2b2d7277b 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -18,6 +18,7 @@ import { config as spellcheckerConfig } from '../../features/spellchecker'; | |||
18 | 18 | ||
19 | import { getSelectOptions } from '../../helpers/i18n-helpers'; | 19 | import { getSelectOptions } from '../../helpers/i18n-helpers'; |
20 | import { hash } from '../../helpers/password-helpers'; | 20 | import { hash } from '../../helpers/password-helpers'; |
21 | import defaultUserAgent from '../../helpers/userAgent-helpers'; | ||
21 | 22 | ||
22 | import EditSettingsForm from '../../components/settings/settings/EditSettingsForm'; | 23 | import EditSettingsForm from '../../components/settings/settings/EditSettingsForm'; |
23 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 24 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
@@ -283,6 +284,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
283 | showDragArea: settingsData.showDragArea, | 284 | showDragArea: settingsData.showDragArea, |
284 | enableSpellchecking: settingsData.enableSpellchecking, | 285 | enableSpellchecking: settingsData.enableSpellchecking, |
285 | spellcheckerLanguage: settingsData.spellcheckerLanguage, | 286 | spellcheckerLanguage: settingsData.spellcheckerLanguage, |
287 | userAgentPref: settingsData.userAgentPref, | ||
286 | beta: settingsData.beta, // we need this info in the main process as well | 288 | beta: settingsData.beta, // we need this info in the main process as well |
287 | automaticUpdates: settingsData.automaticUpdates, // we need this info in the main process as well | 289 | automaticUpdates: settingsData.automaticUpdates, // we need this info in the main process as well |
288 | locale: settingsData.locale, // we need this info in the main process as well | 290 | locale: settingsData.locale, // we need this info in the main process as well |
@@ -524,6 +526,12 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
524 | options: spellcheckingLanguages, | 526 | options: spellcheckingLanguages, |
525 | default: DEFAULT_APP_SETTINGS.spellcheckerLanguage, | 527 | default: DEFAULT_APP_SETTINGS.spellcheckerLanguage, |
526 | }, | 528 | }, |
529 | userAgentPref: { | ||
530 | label: intl.formatMessage(globalMessages.userAgentPref), | ||
531 | value: settings.all.app.userAgentPref, | ||
532 | default: DEFAULT_APP_SETTINGS.userAgentPref, | ||
533 | placeholder: defaultUserAgent(), | ||
534 | }, | ||
527 | darkMode: { | 535 | darkMode: { |
528 | label: intl.formatMessage(messages.darkMode), | 536 | label: intl.formatMessage(messages.darkMode), |
529 | value: settings.all.app.darkMode, | 537 | value: settings.all.app.darkMode, |