diff options
author | 2019-08-14 08:04:02 +0200 | |
---|---|---|
committer | 2019-08-14 08:04:02 +0200 | |
commit | 56f4658b58c56dd1e5165be755e8144ba2fd4937 (patch) | |
tree | 6dbc339e69c5c20619778b78e2fa5c4c02fd68a5 | |
parent | Merge branch 'develop' into feature/new-pricing (diff) | |
download | ferdium-app-56f4658b58c56dd1e5165be755e8144ba2fd4937.tar.gz ferdium-app-56f4658b58c56dd1e5165be755e8144ba2fd4937.tar.zst ferdium-app-56f4658b58c56dd1e5165be755e8144ba2fd4937.zip |
remove monthly & yearly names
-rw-r--r-- | src/config.js | 14 | ||||
-rw-r--r-- | src/helpers/plan-helpers.js | 20 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 6 | ||||
-rw-r--r-- | src/i18n/messages/src/helpers/plan-helpers.json | 46 |
4 files changed, 24 insertions, 62 deletions
diff --git a/src/config.js b/src/config.js index edcae9df1..66adedfc6 100644 --- a/src/config.js +++ b/src/config.js | |||
@@ -86,19 +86,17 @@ export const ALLOWED_PROTOCOLS = [ | |||
86 | ]; | 86 | ]; |
87 | 87 | ||
88 | export const PLANS = { | 88 | export const PLANS = { |
89 | PERSONAL_MONTHLY: 'PERSONAL_MONTHLY', | 89 | PERSONAL: 'PERSONAL_MONTHLY', |
90 | PERSONAL_YEARLY: 'PERSONAL_YEARLY', | 90 | PRO: 'PRO_MONTHLY', |
91 | PRO_MONTHLY: 'PRO_MONTHLY', | ||
92 | PRO_YEARLY: 'PRO_YEARLY', | ||
93 | LEGACY: 'LEGACY', | 91 | LEGACY: 'LEGACY', |
94 | FREE: 'FREE', | 92 | FREE: 'FREE', |
95 | }; | 93 | }; |
96 | 94 | ||
97 | export const PLANS_MAPPING = { | 95 | export const PLANS_MAPPING = { |
98 | 'franz-personal-monthly': PLANS.PERSONAL_MONTHLY, | 96 | 'franz-personal-monthly': PLANS.PERSONAL, |
99 | 'franz-personal-yearly': PLANS.PERSONAL_YEARLY, | 97 | 'franz-personal-yearly': PLANS.PERSONAL, |
100 | 'franz-pro-monthly': PLANS.PRO_MONTHLY, | 98 | 'franz-pro-monthly': PLANS.PRO, |
101 | 'franz-pro-yearly': PLANS.PRO_YEARLY, | 99 | 'franz-pro-yearly': PLANS.PRO, |
102 | 'franz-supporter-license': PLANS.LEGACY, | 100 | 'franz-supporter-license': PLANS.LEGACY, |
103 | 'franz-supporter-license-x1': PLANS.LEGACY, | 101 | 'franz-supporter-license-x1': PLANS.LEGACY, |
104 | 'franz-supporter-license-x2': PLANS.LEGACY, | 102 | 'franz-supporter-license-x2': PLANS.LEGACY, |
diff --git a/src/helpers/plan-helpers.js b/src/helpers/plan-helpers.js index 37a4457af..19392585e 100644 --- a/src/helpers/plan-helpers.js +++ b/src/helpers/plan-helpers.js | |||
@@ -2,21 +2,13 @@ import { defineMessages } from 'react-intl'; | |||
2 | import { PLANS_MAPPING, PLANS } from '../config'; | 2 | import { PLANS_MAPPING, PLANS } from '../config'; |
3 | 3 | ||
4 | const messages = defineMessages({ | 4 | const messages = defineMessages({ |
5 | [PLANS.PRO_YEARLY]: { | 5 | [PLANS.PRO]: { |
6 | id: 'pricing.plan.pro-yearly', | 6 | id: 'pricing.plan.pro', |
7 | defaultMessage: '!!!Franz Professional Yearly', | 7 | defaultMessage: '!!!Franz Professional', |
8 | }, | 8 | }, |
9 | [PLANS.PRO_MONTHLY]: { | 9 | [PLANS.PERSONAL]: { |
10 | id: 'pricing.plan.pro-monthly', | 10 | id: 'pricing.plan.personal', |
11 | defaultMessage: '!!!Franz Professional Monthly', | 11 | defaultMessage: '!!!Franz Personal', |
12 | }, | ||
13 | [PLANS.PERSONAL_YEARLY]: { | ||
14 | id: 'pricing.plan.personal-yearly', | ||
15 | defaultMessage: '!!!Franz Personal Yearly', | ||
16 | }, | ||
17 | [PLANS.PERSONAL_MONTHLY]: { | ||
18 | id: 'pricing.plan.personal-monthly', | ||
19 | defaultMessage: '!!!Franz Personal Monthly', | ||
20 | }, | 12 | }, |
21 | [PLANS.FREE]: { | 13 | [PLANS.FREE]: { |
22 | id: 'pricing.plan.free', | 14 | id: 'pricing.plan.free', |
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index cd1e39543..a4c828f92 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -122,10 +122,8 @@ | |||
122 | "pricing.features.workspaces": "Workspaces", | 122 | "pricing.features.workspaces": "Workspaces", |
123 | "pricing.plan.free": "Franz Free", | 123 | "pricing.plan.free": "Franz Free", |
124 | "pricing.plan.legacy": "Franz Premium", | 124 | "pricing.plan.legacy": "Franz Premium", |
125 | "pricing.plan.personal-monthly": "Franz Personal Monthly", | 125 | "pricing.plan.personal": "Franz Personal", |
126 | "pricing.plan.personal-yearly": "Franz Personal Yearly", | 126 | "pricing.plan.pro": "Franz Professional", |
127 | "pricing.plan.pro-monthly": "Franz Professional Monthly", | ||
128 | "pricing.plan.pro-yearly": "Franz Professional Yearly", | ||
129 | "pricing.trial.cta.accept": "Yes, upgrade my account to Franz Professional", | 127 | "pricing.trial.cta.accept": "Yes, upgrade my account to Franz Professional", |
130 | "pricing.trial.cta.skip": "Continue to Franz", | 128 | "pricing.trial.cta.skip": "Continue to Franz", |
131 | "pricing.trial.error": "Sorry, we could not activate your trial!", | 129 | "pricing.trial.error": "Sorry, we could not activate your trial!", |
diff --git a/src/i18n/messages/src/helpers/plan-helpers.json b/src/i18n/messages/src/helpers/plan-helpers.json index de27dfcfd..df8ee19e3 100644 --- a/src/i18n/messages/src/helpers/plan-helpers.json +++ b/src/i18n/messages/src/helpers/plan-helpers.json | |||
@@ -1,11 +1,11 @@ | |||
1 | [ | 1 | [ |
2 | { | 2 | { |
3 | "id": "pricing.plan.pro-yearly", | 3 | "id": "pricing.plan.pro", |
4 | "defaultMessage": "!!!Franz Professional Yearly", | 4 | "defaultMessage": "!!!Franz Professional", |
5 | "file": "src/helpers/plan-helpers.js", | 5 | "file": "src/helpers/plan-helpers.js", |
6 | "start": { | 6 | "start": { |
7 | "line": 5, | 7 | "line": 5, |
8 | "column": 22 | 8 | "column": 15 |
9 | }, | 9 | }, |
10 | "end": { | 10 | "end": { |
11 | "line": 8, | 11 | "line": 8, |
@@ -13,12 +13,12 @@ | |||
13 | } | 13 | } |
14 | }, | 14 | }, |
15 | { | 15 | { |
16 | "id": "pricing.plan.pro-monthly", | 16 | "id": "pricing.plan.personal", |
17 | "defaultMessage": "!!!Franz Professional Monthly", | 17 | "defaultMessage": "!!!Franz Personal", |
18 | "file": "src/helpers/plan-helpers.js", | 18 | "file": "src/helpers/plan-helpers.js", |
19 | "start": { | 19 | "start": { |
20 | "line": 9, | 20 | "line": 9, |
21 | "column": 23 | 21 | "column": 20 |
22 | }, | 22 | }, |
23 | "end": { | 23 | "end": { |
24 | "line": 12, | 24 | "line": 12, |
@@ -26,41 +26,15 @@ | |||
26 | } | 26 | } |
27 | }, | 27 | }, |
28 | { | 28 | { |
29 | "id": "pricing.plan.personal-yearly", | ||
30 | "defaultMessage": "!!!Franz Personal Yearly", | ||
31 | "file": "src/helpers/plan-helpers.js", | ||
32 | "start": { | ||
33 | "line": 13, | ||
34 | "column": 27 | ||
35 | }, | ||
36 | "end": { | ||
37 | "line": 16, | ||
38 | "column": 3 | ||
39 | } | ||
40 | }, | ||
41 | { | ||
42 | "id": "pricing.plan.personal-monthly", | ||
43 | "defaultMessage": "!!!Franz Personal Monthly", | ||
44 | "file": "src/helpers/plan-helpers.js", | ||
45 | "start": { | ||
46 | "line": 17, | ||
47 | "column": 28 | ||
48 | }, | ||
49 | "end": { | ||
50 | "line": 20, | ||
51 | "column": 3 | ||
52 | } | ||
53 | }, | ||
54 | { | ||
55 | "id": "pricing.plan.free", | 29 | "id": "pricing.plan.free", |
56 | "defaultMessage": "!!!Franz Free", | 30 | "defaultMessage": "!!!Franz Free", |
57 | "file": "src/helpers/plan-helpers.js", | 31 | "file": "src/helpers/plan-helpers.js", |
58 | "start": { | 32 | "start": { |
59 | "line": 21, | 33 | "line": 13, |
60 | "column": 16 | 34 | "column": 16 |
61 | }, | 35 | }, |
62 | "end": { | 36 | "end": { |
63 | "line": 24, | 37 | "line": 16, |
64 | "column": 3 | 38 | "column": 3 |
65 | } | 39 | } |
66 | }, | 40 | }, |
@@ -69,11 +43,11 @@ | |||
69 | "defaultMessage": "!!!Franz Premium", | 43 | "defaultMessage": "!!!Franz Premium", |
70 | "file": "src/helpers/plan-helpers.js", | 44 | "file": "src/helpers/plan-helpers.js", |
71 | "start": { | 45 | "start": { |
72 | "line": 25, | 46 | "line": 17, |
73 | "column": 18 | 47 | "column": 18 |
74 | }, | 48 | }, |
75 | "end": { | 49 | "end": { |
76 | "line": 28, | 50 | "line": 20, |
77 | "column": 3 | 51 | "column": 3 |
78 | } | 52 | } |
79 | } | 53 | } |