From dcab45a323f53a10ff5f419daa5ba6442817eebc Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Tue, 14 Nov 2017 21:04:41 +0100 Subject: feat(App): Add option to enable/disable spell checker --- src/containers/settings/EditSettingsScreen.js | 38 ++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 6 deletions(-) (limited to 'src/containers/settings') diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index e146dc97c..62e255dab 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js @@ -7,7 +7,7 @@ import AppStore from '../../stores/AppStore'; import SettingsStore from '../../stores/SettingsStore'; import UserStore from '../../stores/UserStore'; import Form from '../../lib/Form'; -import languages from '../../i18n/languages'; +import { APP_LOCALES } from '../../i18n/languages'; import { gaPage } from '../../lib/analytics'; import { DEFAULT_APP_SETTINGS } from '../../config'; @@ -47,6 +47,14 @@ const messages = defineMessages({ id: 'settings.app.form.enableSpellchecking', defaultMessage: '!!!Enable spell checking', }, + spellcheckingLanguage: { + id: 'settings.app.form.spellcheckingLanguage', + defaultMessage: '!!!Language for spell checking', + }, + // spellcheckingAutomaticDetection: { + // id: 'settings.app.form.spellcheckingAutomaticDetection', + // defaultMessage: '!!!Detect language automatically', + // }, beta: { id: 'settings.app.form.beta', defaultMessage: '!!!Include beta versions', @@ -78,6 +86,7 @@ export default class EditSettingsScreen extends Component { minimizeToSystemTray: settingsData.minimizeToSystemTray, showDisabledServices: settingsData.showDisabledServices, enableSpellchecking: settingsData.enableSpellchecking, + // spellcheckingLanguage: settingsData.spellcheckingLanguage, locale: settingsData.locale, beta: settingsData.beta, }, @@ -94,14 +103,25 @@ export default class EditSettingsScreen extends Component { const { app, settings, user } = this.props.stores; const { intl } = this.context; - const options = []; - Object.keys(languages).forEach((key) => { - options.push({ + const locales = []; + Object.keys(APP_LOCALES).forEach((key) => { + locales.push({ value: key, - label: languages[key], + label: APP_LOCALES[key], }); }); + // const spellcheckerLocales = [{ + // value: 'auto', + // label: intl.formatMessage(messages.spellcheckingAutomaticDetection), + // }]; + // Object.keys(SPELLCHECKER_LOCALES).forEach((key) => { + // spellcheckerLocales.push({ + // value: key, + // label: SPELLCHECKER_LOCALES[key], + // }); + // }); + const config = { fields: { autoLaunchOnStart: { @@ -139,10 +159,16 @@ export default class EditSettingsScreen extends Component { value: settings.all.enableSpellchecking, default: DEFAULT_APP_SETTINGS.enableSpellchecking, }, + // spellcheckingLanguage: { + // label: intl.formatMessage(messages.spellcheckingLanguage), + // value: settings.all.spellcheckingLanguage, + // options: spellcheckerLocales, + // default: DEFAULT_APP_SETTINGS.spellcheckingLanguage, + // }, locale: { label: intl.formatMessage(messages.language), value: app.locale, - options, + options: locales, default: DEFAULT_APP_SETTINGS.locale, }, beta: { -- cgit v1.2.3-70-g09d2