diff options
author | Amine Mouafik <amine@mouafik.fr> | 2019-05-12 20:00:41 +0700 |
---|---|---|
committer | Amine Mouafik <amine@mouafik.fr> | 2019-05-12 20:00:41 +0700 |
commit | d8a1d5f9151cc31f4c2b5c0096a35e49b2c74d61 (patch) | |
tree | 3974d449d8ef389fc61bf880ae758b5debc22a80 /src/components/subscription/SubscriptionForm.js | |
parent | Use dark background in SVG logo (diff) | |
parent | Update CHANGELOG.md (diff) | |
download | ferdium-app-d8a1d5f9151cc31f4c2b5c0096a35e49b2c74d61.tar.gz ferdium-app-d8a1d5f9151cc31f4c2b5c0096a35e49b2c74d61.tar.zst ferdium-app-d8a1d5f9151cc31f4c2b5c0096a35e49b2c74d61.zip |
Merge tag 'v5.1.0'
# Conflicts:
# README.md
# src/components/layout/AppLayout.js
Diffstat (limited to 'src/components/subscription/SubscriptionForm.js')
-rw-r--r-- | src/components/subscription/SubscriptionForm.js | 67 |
1 files changed, 36 insertions, 31 deletions
diff --git a/src/components/subscription/SubscriptionForm.js b/src/components/subscription/SubscriptionForm.js index 90da8ddc3..50f1e0522 100644 --- a/src/components/subscription/SubscriptionForm.js +++ b/src/components/subscription/SubscriptionForm.js | |||
@@ -35,31 +35,33 @@ 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 | workspaces: { |
55 | ads: { | 55 | id: 'subscription.features.workspaces', |
56 | id: 'subscription.features.ads', | 56 | defaultMessage: '!!!Organize your services in workspaces', |
57 | defaultMessage: '!!!No ads, ever!', | 57 | }, |
58 | }, | 58 | ads: { |
59 | comingSoon: { | 59 | id: 'subscription.features.ads', |
60 | id: 'subscription.features.comingSoon', | 60 | defaultMessage: '!!!No ads, ever!', |
61 | defaultMessage: '!!!coming soon', | 61 | }, |
62 | }, | 62 | comingSoon: { |
63 | id: 'subscription.features.comingSoon', | ||
64 | defaultMessage: '!!!coming soon', | ||
63 | }, | 65 | }, |
64 | euTaxInfo: { | 66 | euTaxInfo: { |
65 | id: 'subscription.euTaxInfo', | 67 | id: 'subscription.euTaxInfo', |
@@ -85,7 +87,7 @@ export default @observer class SubscriptionForm extends Component { | |||
85 | showSkipOption: false, | 87 | showSkipOption: false, |
86 | skipAction: () => null, | 88 | skipAction: () => null, |
87 | skipButtonLabel: '', | 89 | skipButtonLabel: '', |
88 | } | 90 | }; |
89 | 91 | ||
90 | static contextTypes = { | 92 | static contextTypes = { |
91 | intl: intlShape, | 93 | intl: intlShape, |
@@ -162,18 +164,21 @@ export default @observer class SubscriptionForm extends Component { | |||
162 | </p> | 164 | </p> |
163 | <div className="subscription"> | 165 | <div className="subscription"> |
164 | <ul className="subscription__premium-features"> | 166 | <ul className="subscription__premium-features"> |
165 | <li>{intl.formatMessage(messages.features.onpremise)}</li> | 167 | <li>{intl.formatMessage(messages.onpremise)}</li> |
168 | <li> | ||
169 | {intl.formatMessage(messages.noInterruptions)} | ||
170 | </li> | ||
166 | <li> | 171 | <li> |
167 | {intl.formatMessage(messages.features.noInterruptions)} | 172 | {intl.formatMessage(messages.spellchecker)} |
168 | </li> | 173 | </li> |
169 | <li> | 174 | <li> |
170 | {intl.formatMessage(messages.features.spellchecker)} | 175 | {intl.formatMessage(messages.proxy)} |
171 | </li> | 176 | </li> |
172 | <li> | 177 | <li> |
173 | {intl.formatMessage(messages.features.proxy)} | 178 | {intl.formatMessage(messages.workspaces)} |
174 | </li> | 179 | </li> |
175 | <li> | 180 | <li> |
176 | {intl.formatMessage(messages.features.ads)} | 181 | {intl.formatMessage(messages.ads)} |
177 | </li> | 182 | </li> |
178 | </ul> | 183 | </ul> |
179 | </div> | 184 | </div> |