aboutsummaryrefslogtreecommitdiffstats
path: root/src/components
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2019-02-12 20:49:05 +0100
committerLibravatar Stefan Malzner <stefan@adlk.io>2019-02-12 20:49:05 +0100
commit243bd8fe742449668d559b9e7eaeff91467ac794 (patch)
tree53fcca658be5bb906bf6b335d6e96c6b67d84e52 /src/components
parentfeat(Windows): Add option to quit Franz from Taskbar icon (diff)
parentfeat(Spell checking): Add option to automatically detect language (diff)
downloadferdium-app-243bd8fe742449668d559b9e7eaeff91467ac794.tar.gz
ferdium-app-243bd8fe742449668d559b9e7eaeff91467ac794.tar.zst
ferdium-app-243bd8fe742449668d559b9e7eaeff91467ac794.zip
Merge branch 'feature/spellcheck-autodetect' into release/5.0.0
Diffstat (limited to 'src/components')
-rw-r--r--src/components/settings/services/EditServiceForm.js10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index 468d85c45..21616b5de 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -128,7 +128,8 @@ export default @observer class EditServiceForm extends Component {
128 isSaving: PropTypes.bool.isRequired, 128 isSaving: PropTypes.bool.isRequired,
129 isDeleting: PropTypes.bool.isRequired, 129 isDeleting: PropTypes.bool.isRequired,
130 isProxyFeatureEnabled: PropTypes.bool.isRequired, 130 isProxyFeatureEnabled: PropTypes.bool.isRequired,
131 isProxyFeaturePremiumFeature: PropTypes.bool.isRequired, 131 isProxyPremiumFeature: PropTypes.bool.isRequired,
132 isSpellcheckerPremiumFeature: PropTypes.bool.isRequired,
132 }; 133 };
133 134
134 static defaultProps = { 135 static defaultProps = {
@@ -191,7 +192,8 @@ export default @observer class EditServiceForm extends Component {
191 isDeleting, 192 isDeleting,
192 onDelete, 193 onDelete,
193 isProxyFeatureEnabled, 194 isProxyFeatureEnabled,
194 isProxyFeaturePremiumFeature, 195 isProxyPremiumFeature,
196 isSpellcheckerPremiumFeature,
195 } = this.props; 197 } = this.props;
196 const { intl } = this.context; 198 const { intl } = this.context;
197 199
@@ -339,14 +341,14 @@ export default @observer class EditServiceForm extends Component {
339 </div> 341 </div>
340 </div> 342 </div>
341 343
342 <PremiumFeatureContainer> 344 <PremiumFeatureContainer condition={isSpellcheckerPremiumFeature}>
343 <div className="settings__settings-group"> 345 <div className="settings__settings-group">
344 <Select field={form.$('spellcheckerLanguage')} /> 346 <Select field={form.$('spellcheckerLanguage')} />
345 </div> 347 </div>
346 </PremiumFeatureContainer> 348 </PremiumFeatureContainer>
347 349
348 {isProxyFeatureEnabled && ( 350 {isProxyFeatureEnabled && (
349 <PremiumFeatureContainer condition={isProxyFeaturePremiumFeature}> 351 <PremiumFeatureContainer condition={isProxyPremiumFeature}>
350 <div className="settings__settings-group"> 352 <div className="settings__settings-group">
351 <h3> 353 <h3>
352 {intl.formatMessage(messages.headlineProxy)} 354 {intl.formatMessage(messages.headlineProxy)}