remove monthly & yearly names

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 = [
 ];
 
 export const PLANS = {
-  PERSONAL_MONTHLY: 'PERSONAL_MONTHLY',
-  PERSONAL_YEARLY: 'PERSONAL_YEARLY',
-  PRO_MONTHLY: 'PRO_MONTHLY',
-  PRO_YEARLY: 'PRO_YEARLY',
+  PERSONAL: 'PERSONAL_MONTHLY',
+  PRO: 'PRO_MONTHLY',
   LEGACY: 'LEGACY',
   FREE: 'FREE',
 };
 
 export const PLANS_MAPPING = {
-  'franz-personal-monthly': PLANS.PERSONAL_MONTHLY,
-  'franz-personal-yearly': PLANS.PERSONAL_YEARLY,
-  'franz-pro-monthly': PLANS.PRO_MONTHLY,
-  'franz-pro-yearly': PLANS.PRO_YEARLY,
+  'franz-personal-monthly': PLANS.PERSONAL,
+  'franz-personal-yearly': PLANS.PERSONAL,
+  'franz-pro-monthly': PLANS.PRO,
+  'franz-pro-yearly': PLANS.PRO,
   'franz-supporter-license': PLANS.LEGACY,
   'franz-supporter-license-x1': PLANS.LEGACY,
   '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';
 import { PLANS_MAPPING, PLANS } from '../config';
 
 const messages = defineMessages({
-  [PLANS.PRO_YEARLY]: {
-    id: 'pricing.plan.pro-yearly',
-    defaultMessage: '!!!Franz Professional Yearly',
+  [PLANS.PRO]: {
+    id: 'pricing.plan.pro',
+    defaultMessage: '!!!Franz Professional',
   },
-  [PLANS.PRO_MONTHLY]: {
-    id: 'pricing.plan.pro-monthly',
-    defaultMessage: '!!!Franz Professional Monthly',
-  },
-  [PLANS.PERSONAL_YEARLY]: {
-    id: 'pricing.plan.personal-yearly',
-    defaultMessage: '!!!Franz Personal Yearly',
-  },
-  [PLANS.PERSONAL_MONTHLY]: {
-    id: 'pricing.plan.personal-monthly',
-    defaultMessage: '!!!Franz Personal Monthly',
+  [PLANS.PERSONAL]: {
+    id: 'pricing.plan.personal',
+    defaultMessage: '!!!Franz Personal',
   },
   [PLANS.FREE]: {
     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 @@
   "pricing.features.workspaces": "Workspaces",
   "pricing.plan.free": "Franz Free",
   "pricing.plan.legacy": "Franz Premium",
-  "pricing.plan.personal-monthly": "Franz Personal Monthly",
-  "pricing.plan.personal-yearly": "Franz Personal Yearly",
-  "pricing.plan.pro-monthly": "Franz Professional Monthly",
-  "pricing.plan.pro-yearly": "Franz Professional Yearly",
+  "pricing.plan.personal": "Franz Personal",
+  "pricing.plan.pro": "Franz Professional",
   "pricing.trial.cta.accept": "Yes, upgrade my account to Franz Professional",
   "pricing.trial.cta.skip": "Continue to Franz",
   "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 @@
 [
   {
-    "id": "pricing.plan.pro-yearly",
-    "defaultMessage": "!!!Franz Professional Yearly",
+    "id": "pricing.plan.pro",
+    "defaultMessage": "!!!Franz Professional",
     "file": "src/helpers/plan-helpers.js",
     "start": {
       "line": 5,
-      "column": 22
+      "column": 15
     },
     "end": {
       "line": 8,
@@ -13,12 +13,12 @@
     }
   },
   {
-    "id": "pricing.plan.pro-monthly",
-    "defaultMessage": "!!!Franz Professional Monthly",
+    "id": "pricing.plan.personal",
+    "defaultMessage": "!!!Franz Personal",
     "file": "src/helpers/plan-helpers.js",
     "start": {
       "line": 9,
-      "column": 23
+      "column": 20
     },
     "end": {
       "line": 12,
@@ -26,41 +26,15 @@
     }
   },
   {
-    "id": "pricing.plan.personal-yearly",
-    "defaultMessage": "!!!Franz Personal Yearly",
-    "file": "src/helpers/plan-helpers.js",
-    "start": {
-      "line": 13,
-      "column": 27
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.plan.personal-monthly",
-    "defaultMessage": "!!!Franz Personal Monthly",
-    "file": "src/helpers/plan-helpers.js",
-    "start": {
-      "line": 17,
-      "column": 28
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
     "id": "pricing.plan.free",
     "defaultMessage": "!!!Franz Free",
     "file": "src/helpers/plan-helpers.js",
     "start": {
-      "line": 21,
+      "line": 13,
       "column": 16
     },
     "end": {
-      "line": 24,
+      "line": 16,
       "column": 3
     }
   },
@@ -69,11 +43,11 @@
     "defaultMessage": "!!!Franz Premium",
     "file": "src/helpers/plan-helpers.js",
     "start": {
-      "line": 25,
+      "line": 17,
       "column": 18
     },
     "end": {
-      "line": 28,
+      "line": 20,
       "column": 3
     }
   }