diff options
Diffstat (limited to 'src/containers/settings/EditSettingsScreen.js')
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 58 |
1 files changed, 52 insertions, 6 deletions
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index b10acf3c6..45ded9e5c 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -7,7 +7,7 @@ import AppStore from '../../stores/AppStore'; | |||
7 | import SettingsStore from '../../stores/SettingsStore'; | 7 | import SettingsStore from '../../stores/SettingsStore'; |
8 | import UserStore from '../../stores/UserStore'; | 8 | import UserStore from '../../stores/UserStore'; |
9 | import Form from '../../lib/Form'; | 9 | import Form from '../../lib/Form'; |
10 | import languages from '../../i18n/languages'; | 10 | import { APP_LOCALES } from '../../i18n/languages'; |
11 | import { gaPage } from '../../lib/analytics'; | 11 | import { gaPage } from '../../lib/analytics'; |
12 | import { DEFAULT_APP_SETTINGS } from '../../config'; | 12 | import { DEFAULT_APP_SETTINGS } from '../../config'; |
13 | 13 | ||
@@ -43,6 +43,22 @@ const messages = defineMessages({ | |||
43 | id: 'settings.app.form.showDisabledServices', | 43 | id: 'settings.app.form.showDisabledServices', |
44 | defaultMessage: '!!!Display disabled services tabs', | 44 | defaultMessage: '!!!Display disabled services tabs', |
45 | }, | 45 | }, |
46 | showMessageBadgeWhenMuted: { | ||
47 | id: 'settings.app.form.showMessagesBadgesWhenMuted', | ||
48 | defaultMessage: '!!!Show unread message badge when notifications are disabled', | ||
49 | }, | ||
50 | enableSpellchecking: { | ||
51 | id: 'settings.app.form.enableSpellchecking', | ||
52 | defaultMessage: '!!!Enable spell checking', | ||
53 | }, | ||
54 | spellcheckingLanguage: { | ||
55 | id: 'settings.app.form.spellcheckingLanguage', | ||
56 | defaultMessage: '!!!Language for spell checking', | ||
57 | }, | ||
58 | // spellcheckingAutomaticDetection: { | ||
59 | // id: 'settings.app.form.spellcheckingAutomaticDetection', | ||
60 | // defaultMessage: '!!!Detect language automatically', | ||
61 | // }, | ||
46 | beta: { | 62 | beta: { |
47 | id: 'settings.app.form.beta', | 63 | id: 'settings.app.form.beta', |
48 | defaultMessage: '!!!Include beta versions', | 64 | defaultMessage: '!!!Include beta versions', |
@@ -73,6 +89,9 @@ export default class EditSettingsScreen extends Component { | |||
73 | enableSystemTray: settingsData.enableSystemTray, | 89 | enableSystemTray: settingsData.enableSystemTray, |
74 | minimizeToSystemTray: settingsData.minimizeToSystemTray, | 90 | minimizeToSystemTray: settingsData.minimizeToSystemTray, |
75 | showDisabledServices: settingsData.showDisabledServices, | 91 | showDisabledServices: settingsData.showDisabledServices, |
92 | showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted, | ||
93 | enableSpellchecking: settingsData.enableSpellchecking, | ||
94 | // spellcheckingLanguage: settingsData.spellcheckingLanguage, | ||
76 | locale: settingsData.locale, | 95 | locale: settingsData.locale, |
77 | beta: settingsData.beta, | 96 | beta: settingsData.beta, |
78 | }, | 97 | }, |
@@ -89,14 +108,25 @@ export default class EditSettingsScreen extends Component { | |||
89 | const { app, settings, user } = this.props.stores; | 108 | const { app, settings, user } = this.props.stores; |
90 | const { intl } = this.context; | 109 | const { intl } = this.context; |
91 | 110 | ||
92 | const options = []; | 111 | const locales = []; |
93 | Object.keys(languages).forEach((key) => { | 112 | Object.keys(APP_LOCALES).forEach((key) => { |
94 | options.push({ | 113 | locales.push({ |
95 | value: key, | 114 | value: key, |
96 | label: languages[key], | 115 | label: APP_LOCALES[key], |
97 | }); | 116 | }); |
98 | }); | 117 | }); |
99 | 118 | ||
119 | // const spellcheckerLocales = [{ | ||
120 | // value: 'auto', | ||
121 | // label: intl.formatMessage(messages.spellcheckingAutomaticDetection), | ||
122 | // }]; | ||
123 | // Object.keys(SPELLCHECKER_LOCALES).forEach((key) => { | ||
124 | // spellcheckerLocales.push({ | ||
125 | // value: key, | ||
126 | // label: SPELLCHECKER_LOCALES[key], | ||
127 | // }); | ||
128 | // }); | ||
129 | |||
100 | const config = { | 130 | const config = { |
101 | fields: { | 131 | fields: { |
102 | autoLaunchOnStart: { | 132 | autoLaunchOnStart: { |
@@ -129,10 +159,26 @@ export default class EditSettingsScreen extends Component { | |||
129 | value: settings.all.showDisabledServices, | 159 | value: settings.all.showDisabledServices, |
130 | default: DEFAULT_APP_SETTINGS.showDisabledServices, | 160 | default: DEFAULT_APP_SETTINGS.showDisabledServices, |
131 | }, | 161 | }, |
162 | showMessageBadgeWhenMuted: { | ||
163 | label: intl.formatMessage(messages.showMessageBadgeWhenMuted), | ||
164 | value: settings.all.showMessageBadgeWhenMuted, | ||
165 | default: DEFAULT_APP_SETTINGS.showMessageBadgeWhenMuted, | ||
166 | }, | ||
167 | enableSpellchecking: { | ||
168 | label: intl.formatMessage(messages.enableSpellchecking), | ||
169 | value: settings.all.enableSpellchecking, | ||
170 | default: DEFAULT_APP_SETTINGS.enableSpellchecking, | ||
171 | }, | ||
172 | // spellcheckingLanguage: { | ||
173 | // label: intl.formatMessage(messages.spellcheckingLanguage), | ||
174 | // value: settings.all.spellcheckingLanguage, | ||
175 | // options: spellcheckerLocales, | ||
176 | // default: DEFAULT_APP_SETTINGS.spellcheckingLanguage, | ||
177 | // }, | ||
132 | locale: { | 178 | locale: { |
133 | label: intl.formatMessage(messages.language), | 179 | label: intl.formatMessage(messages.language), |
134 | value: app.locale, | 180 | value: app.locale, |
135 | options, | 181 | options: locales, |
136 | default: DEFAULT_APP_SETTINGS.locale, | 182 | default: DEFAULT_APP_SETTINGS.locale, |
137 | }, | 183 | }, |
138 | beta: { | 184 | beta: { |