From f530f689c3275f2145283df235af6c8e99a5cdcc Mon Sep 17 00:00:00 2001
From: vantezzen <properly@protonmail.com>
Date: Sat, 7 Sep 2019 15:56:31 +0200
Subject: Enable todos for all users

---
 src/features/todos/containers/TodosScreen.js |  2 +-
 src/i18n/locales/defaultMessages.json        | 12 ++++++------
 src/i18n/locales/en-US.json                  | 14 --------------
 3 files changed, 7 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/features/todos/containers/TodosScreen.js b/src/features/todos/containers/TodosScreen.js
index a5da0b014..0bd591c59 100644
--- a/src/features/todos/containers/TodosScreen.js
+++ b/src/features/todos/containers/TodosScreen.js
@@ -25,7 +25,7 @@ class TodosScreen extends Component {
           width={todosStore.width}
           minWidth={TODOS_MIN_WIDTH}
           resize={width => todoActions.resize({ width })}
-          isTodosIncludedInCurrentPlan={this.props.stores.features.features.isTodosIncludedInCurrentPlan || false}
+          isTodosIncludedInCurrentPlan={true}
         />
       </ErrorBoundary>
     );
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 2dd778434..51306eceb 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -773,7 +773,7 @@
         "defaultMessage": "!!!Could not load services and user information",
         "end": {
           "column": 3,
-          "line": 39
+          "line": 36
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.requiredRequestsFailed",
@@ -3207,13 +3207,13 @@
         "defaultMessage": "!!!Upgrade account",
         "end": {
           "column": 3,
-          "line": 19
+          "line": 17
         },
         "file": "src/components/ui/PremiumFeatureContainer/index.js",
         "id": "premiumFeature.button.upgradeAccount",
         "start": {
           "column": 10,
-          "line": 16
+          "line": 14
         }
       }
     ],
@@ -3920,7 +3920,7 @@
         "defaultMessage": "!!!Upgrade account",
         "end": {
           "column": 3,
-          "line": 17
+          "line": 18
         },
         "file": "src/features/serviceLimit/components/LimitReachedInfobox.js",
         "id": "premiumFeature.button.upgradeAccount",
@@ -3935,7 +3935,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Franz is better together!",
+        "defaultMessage": "!!!Ferdi is better together!",
         "end": {
           "column": 3,
           "line": 21
@@ -4433,7 +4433,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Less is More: Introducing Franz Workspaces",
+        "defaultMessage": "!!!Less is More: Introducing Ferdi Workspaces",
         "end": {
           "column": 3,
           "line": 50
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 55de9bdeb..72a296430 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -351,20 +351,6 @@
   "signup.link.login": "Already have an account, sign in?",
   "signup.password.label": "Password",
   "signup.submit.label": "Create account",
-  "subscription.euTaxInfo": "EU residents: local sales tax may apply",
-  "subscription.features.ads": "No ads, ever!",
-  "subscription.features.comingSoon": "coming soon",
-  "subscription.features.noInterruptions": "No app delays & nagging to upgrade license",
-  "subscription.features.onpremise.mattermost": "Add on-premise/hosted services like Mattermost",
-  "subscription.features.proxy": "Proxy support for services",
-  "subscription.features.spellchecker": "Support for spellchecker",
-  "subscription.features.workspaces": "Organize your services in workspaces",
-  "subscription.includedFeatures": "Paid Ferdi Premium Supporter Account includes",
-  "subscription.paymentSessionError": "Could not initialize payment form",
-  "subscription.submit.label": "I want to support the development of Franz",
-  "subscription.type.free": "free",
-  "subscription.type.month": "month",
-  "subscription.type.year": "year",
   "subscription.cta.activateTrial": "Yes, start the free Franz Professional trial",
   "subscription.cta.allOptions": "See all options",
   "subscription.cta.choosePlan": "Choose your plan",
-- 
cgit v1.2.3-70-g09d2