diff options
author | 2019-03-08 15:28:35 +0100 | |
---|---|---|
committer | 2019-03-08 15:28:35 +0100 | |
commit | b6469566c2c88e8a61334d5d15a0f7c1afe08288 (patch) | |
tree | f42dd4962c74057c6432866205b16c9d78a1c07e /src/components | |
parent | remove dev logs (diff) | |
parent | correctly update services submenu on language change (diff) | |
download | ferdium-app-b6469566c2c88e8a61334d5d15a0f7c1afe08288.tar.gz ferdium-app-b6469566c2c88e8a61334d5d15a0f7c1afe08288.tar.zst ferdium-app-b6469566c2c88e8a61334d5d15a0f7c1afe08288.zip |
fix merge conflicts with latest develop
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/settings/account/AccountDashboard.js | 4 | ||||
-rw-r--r-- | src/components/subscription/SubscriptionForm.js | 60 |
2 files changed, 29 insertions, 35 deletions
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js index f2d3ca8c0..181b95c8c 100644 --- a/src/components/settings/account/AccountDashboard.js +++ b/src/components/settings/account/AccountDashboard.js | |||
@@ -44,10 +44,6 @@ const messages = defineMessages({ | |||
44 | id: 'settings.account.accountType.premium', | 44 | id: 'settings.account.accountType.premium', |
45 | defaultMessage: '!!!Premium Supporter Account', | 45 | defaultMessage: '!!!Premium Supporter Account', |
46 | }, | 46 | }, |
47 | accountTypeEnterprise: { | ||
48 | id: 'settings.account.accountType.enterprise', | ||
49 | defaultMessage: '!!!Enterprise Account', | ||
50 | }, | ||
51 | accountEditButton: { | 47 | accountEditButton: { |
52 | id: 'settings.account.account.editButton', | 48 | id: 'settings.account.account.editButton', |
53 | defaultMessage: '!!!Edit Account', | 49 | defaultMessage: '!!!Edit Account', |
diff --git a/src/components/subscription/SubscriptionForm.js b/src/components/subscription/SubscriptionForm.js index 90da8ddc3..7a818d100 100644 --- a/src/components/subscription/SubscriptionForm.js +++ b/src/components/subscription/SubscriptionForm.js | |||
@@ -35,31 +35,29 @@ const messages = defineMessages({ | |||
35 | id: 'subscription.includedFeatures', | 35 | id: 'subscription.includedFeatures', |
36 | defaultMessage: '!!!The Franz Premium Supporter Account includes', | 36 | defaultMessage: '!!!The Franz Premium Supporter Account includes', |
37 | }, | 37 | }, |
38 | features: { | 38 | onpremise: { |
39 | onpremise: { | 39 | id: 'subscription.features.onpremise.mattermost', |
40 | id: 'subscription.features.onpremise.mattermost', | 40 | defaultMessage: '!!!Add on-premise/hosted services like Mattermost', |
41 | defaultMessage: '!!!Add on-premise/hosted services like Mattermost', | 41 | }, |
42 | }, | 42 | noInterruptions: { |
43 | noInterruptions: { | 43 | id: 'subscription.features.noInterruptions', |
44 | id: 'subscription.features.noInterruptions', | 44 | defaultMessage: '!!!No app delays & nagging to upgrade license', |
45 | defaultMessage: '!!!No app delays & nagging to upgrade license', | 45 | }, |
46 | }, | 46 | proxy: { |
47 | proxy: { | 47 | id: 'subscription.features.proxy', |
48 | id: 'subscription.features.proxy', | 48 | defaultMessage: '!!!Proxy support for services', |
49 | defaultMessage: '!!!Proxy support for services', | 49 | }, |
50 | }, | 50 | spellchecker: { |
51 | spellchecker: { | 51 | id: 'subscription.features.spellchecker', |
52 | id: 'subscription.features.spellchecker', | 52 | defaultMessage: '!!!Support for Spellchecker', |
53 | defaultMessage: '!!!Support for Spellchecker', | 53 | }, |
54 | }, | 54 | ads: { |
55 | ads: { | 55 | id: 'subscription.features.ads', |
56 | id: 'subscription.features.ads', | 56 | defaultMessage: '!!!No ads, ever!', |
57 | defaultMessage: '!!!No ads, ever!', | 57 | }, |
58 | }, | 58 | comingSoon: { |
59 | comingSoon: { | 59 | id: 'subscription.features.comingSoon', |
60 | id: 'subscription.features.comingSoon', | 60 | defaultMessage: '!!!coming soon', |
61 | defaultMessage: '!!!coming soon', | ||
62 | }, | ||
63 | }, | 61 | }, |
64 | euTaxInfo: { | 62 | euTaxInfo: { |
65 | id: 'subscription.euTaxInfo', | 63 | id: 'subscription.euTaxInfo', |
@@ -85,7 +83,7 @@ export default @observer class SubscriptionForm extends Component { | |||
85 | showSkipOption: false, | 83 | showSkipOption: false, |
86 | skipAction: () => null, | 84 | skipAction: () => null, |
87 | skipButtonLabel: '', | 85 | skipButtonLabel: '', |
88 | } | 86 | }; |
89 | 87 | ||
90 | static contextTypes = { | 88 | static contextTypes = { |
91 | intl: intlShape, | 89 | intl: intlShape, |
@@ -162,18 +160,18 @@ export default @observer class SubscriptionForm extends Component { | |||
162 | </p> | 160 | </p> |
163 | <div className="subscription"> | 161 | <div className="subscription"> |
164 | <ul className="subscription__premium-features"> | 162 | <ul className="subscription__premium-features"> |
165 | <li>{intl.formatMessage(messages.features.onpremise)}</li> | 163 | <li>{intl.formatMessage(messages.onpremise)}</li> |
166 | <li> | 164 | <li> |
167 | {intl.formatMessage(messages.features.noInterruptions)} | 165 | {intl.formatMessage(messages.noInterruptions)} |
168 | </li> | 166 | </li> |
169 | <li> | 167 | <li> |
170 | {intl.formatMessage(messages.features.spellchecker)} | 168 | {intl.formatMessage(messages.spellchecker)} |
171 | </li> | 169 | </li> |
172 | <li> | 170 | <li> |
173 | {intl.formatMessage(messages.features.proxy)} | 171 | {intl.formatMessage(messages.proxy)} |
174 | </li> | 172 | </li> |
175 | <li> | 173 | <li> |
176 | {intl.formatMessage(messages.features.ads)} | 174 | {intl.formatMessage(messages.ads)} |
177 | </li> | 175 | </li> |
178 | </ul> | 176 | </ul> |
179 | </div> | 177 | </div> |