From 56ce95a6fd383d41819821d531c1918db901bdcc Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Wed, 2 Oct 2019 15:49:04 +0200
Subject: [PATCH] refactor: follow review of @alina-beck + @mattwr18

---
 webapp/locales/de.json                            | 3 +--
 webapp/locales/en.json                            | 3 +--
 webapp/pages/settings/my-email-address/index.vue  | 2 +-
 webapp/pages/settings/my-email-address/verify.vue | 3 ---
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 1d35da476..c547e063f 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -175,8 +175,7 @@
         "explanation": "Das kann verschiedene Ursachen haben:",
         "reason": {
           "invalid-nonce": "Ist der Bestätigungscode falsch?",
-          "no-email-request": "Wurde gar keine Änderung der E-Mail Adresse angefragt?",
-          "email-address-taken": "Wurde die E-Mail inzwischen einem anderen Benutzer zugewiesen?"
+          "no-email-request": "Bist du dir sicher, dass du eine Änderung deiner E-Mail Adresse angefragt hattest?"
         }
       }
     },
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 0032f1dd1..48fd36c0d 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -175,8 +175,7 @@
         "explanation": "This can have different causes:",
         "reason": {
           "invalid-nonce": "Is the confirmation code invalid?",
-          "no-email-request": "You haven't requested a change of your email address at all?",
-          "email-address-taken": "Has the email been assigned to another user in the meantime?"
+          "no-email-request": "Are you certain that you requested a change of your email address?"
         },
         "support": "If the problem persists, please contact us by email at"
       }
diff --git a/webapp/pages/settings/my-email-address/index.vue b/webapp/pages/settings/my-email-address/index.vue
index 2922f3fdb..fcfeb941d 100644
--- a/webapp/pages/settings/my-email-address/index.vue
+++ b/webapp/pages/settings/my-email-address/index.vue
@@ -19,7 +19,7 @@
           <ds-space class="backendErrors" v-if="backendErrors">
             <ds-text align="center" bold color="danger">{{ backendErrors.message }}</ds-text>
           </ds-space>
-          <ds-button class="submit-button" icon="check" :disabled="errors" type="submit" primary>
+          <ds-button icon="check" :disabled="errors" type="submit" primary>
             {{ $t('actions.save') }}
           </ds-button>
         </template>
diff --git a/webapp/pages/settings/my-email-address/verify.vue b/webapp/pages/settings/my-email-address/verify.vue
index d173a1cf0..21e4fd775 100644
--- a/webapp/pages/settings/my-email-address/verify.vue
+++ b/webapp/pages/settings/my-email-address/verify.vue
@@ -27,9 +27,6 @@
               <ds-list-item>
                 {{ $t(`settings.email.verification-error.reason.no-email-request`) }}
               </ds-list-item>
-              <ds-list-item>
-                {{ $t(`settings.email.verification-error.reason.email-address-taken`) }}
-              </ds-list-item>
             </ds-list>
             {{ $t('settings.email.verification-error.support') }}
             <a href="mailto:support@human-connection.org">support@human-connection.org</a>