From dbbece43b5b800752cc885d7076c662b4235bcf2 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 9 Oct 2019 16:52:48 +0200
Subject: [PATCH] List of providers is always visible, button color changed,
 info text adapted

---
 webapp/locales/de.json                 |  3 ++-
 webapp/locales/en.json                 |  3 ++-
 webapp/pages/settings/allow-embeds.vue | 11 +++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index c763ea504..b7965062b 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -345,7 +345,8 @@
     },
     "allowEmbeds": {
       "name": "Drittanbieter",
-      "description": "In unseren Beiträgen können / werden aus der folgenden Liste an Providern Fremdcode von anderen Anbietern (Drittanbietern) in Form von eingebundenen Videos, Bilder oder Text eingebunden werden.",
+      "info-description": "Wenn du zustimmst werden in den Beiträgen aus der folgenden Liste an Providern Fremdcode von anderen Anbietern (Drittanbietern) in Form von eingebundenen Videos, Bilder oder Text automatisch eingebunden werden.",
+      "description": "Du hast zugestimmt das in den Beiträgen aus der folgenden Liste an Providern Fremdcode von anderen Anbietern (Drittanbietern) in Form von eingebundenen Videos, Bilder oder Text automatisch eingebunden werden.",
       "statustext": "Momentan ist das automatische einbinden:",
       "statuschange": "Einstellung ändern",
       "false": "Abgestellt",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 58f56f142..162f1a0f0 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -346,7 +346,8 @@
     },
     "allowEmbeds": {
       "name": "Third party providers",
-      "description": "In our contributions can / will be included from the following list of providers foreign code from other providers (third parties) in the form of embedded videos, images or text.",
+      "info-description": "If you agree, the posts from the following list of providers will automatically include third-party code from other providers (third parties) in the form of embedded videos, images, or text.",
+      "description": "You have agreed that in the contributions from the following list of providers, foreign code from other providers (third parties) in the form of embedded videos, images or text automatically are embedded.",
       "statustext": "At the moment this is automatic embedding:",
       "statuschange": "Change setting",
       "false": "Turned off",
diff --git a/webapp/pages/settings/allow-embeds.vue b/webapp/pages/settings/allow-embeds.vue
index db6e7552e..c76a50422 100644
--- a/webapp/pages/settings/allow-embeds.vue
+++ b/webapp/pages/settings/allow-embeds.vue
@@ -12,12 +12,12 @@
       <ds-container width="large">
         <ds-flex>
           <ds-flex-item>
-            <ds-button @click="toFalse" primary :disabled="!disabled">
+            <ds-button @click="toFalse" :disabled="!disabled">
               {{ $t('post.allowEmbeds.button-tofalse') }}
             </ds-button>
           </ds-flex-item>
           <ds-flex-item>
-            <ds-button @click="toTrue" danger :disabled="disabled">
+            <ds-button @click="toTrue" secondary :disabled="disabled">
               {{ $t('post.allowEmbeds.button-totrue') }}
             </ds-button>
           </ds-flex-item>
@@ -27,8 +27,11 @@
     <ds-space />
     <ds-space />
 
-    <div v-show="disabled">
-      <p>{{ $t('post.allowEmbeds.description') }}</p>
+    <div>
+      <p v-if="disabled">
+        <b>{{ $t('post.allowEmbeds.description') }}</b>
+      </p>
+      <p v-else>{{ $t('post.allowEmbeds.info-description') }}</p>
       <ds-container>
         <ds-placeholder>
           <ul>