From fd2ae0f2429a1cf12435a05412b76d5dca5f90e1 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 28 Sep 2021 14:55:14 +0200
Subject: [PATCH] remove select 'null' in LanguageSwitchSelect.vue

---
 frontend/src/components/LanguageSwitchSelect.vue | 1 -
 frontend/src/locales/de.json                     | 1 -
 frontend/src/locales/en.json                     | 1 -
 frontend/src/views/Pages/Register.spec.js        | 4 ++--
 frontend/src/views/Pages/Register.vue            | 2 +-
 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/LanguageSwitchSelect.vue b/frontend/src/components/LanguageSwitchSelect.vue
index 518bcf6cf..3467bdafd 100644
--- a/frontend/src/components/LanguageSwitchSelect.vue
+++ b/frontend/src/components/LanguageSwitchSelect.vue
@@ -14,7 +14,6 @@ export default {
     return {
       selected: null,
       options: [
-        { value: null, text: this.$t('select_language') },
         { value: 'de', text: this.$t('languages.de') },
         { value: 'en', text: this.$t('languages.en') },
       ],
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 468c88f85..6dbd06fbd 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -122,7 +122,6 @@
     "text": "Jetzt kannst du ein neues Passwort speichern, mit dem du dich zukünftig in der Gradido-App anmelden kannst.",
     "title": "Passwort zurücksetzen"
   },
-  "select_language": "Bitte wähle eine Sprache für die App und Newsletter",
   "send": "Senden",
   "setting": {
     "changeNewsletter": "Newsletter Status ändern",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 05ce82b7b..39578936d 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -122,7 +122,6 @@
     "text": "Now you can save a new password to login to the Gradido-App in the future.",
     "title": "Reset Password"
   },
-  "select_language": "Please choose a language for the app and newsletter",
   "send": "Send",
   "setting": {
     "changeNewsletter": "Newsletter status change",
diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js
index 04e59cde6..37ee22f78 100644
--- a/frontend/src/views/Pages/Register.spec.js
+++ b/frontend/src/views/Pages/Register.spec.js
@@ -91,7 +91,7 @@ describe('Register', () => {
       })
       it('selected Language value de', async () => {
         wrapper.find('.selectedLanguage').findAll('option').at(1).setSelected()
-        expect(wrapper.find('.selectedLanguage').element.value).toBe('de')
+        expect(wrapper.find('.selectedLanguage').element.value).toBe('en')
       })
 
       it('has 1 checkbox input fields', () => {
@@ -185,7 +185,7 @@ describe('Register', () => {
                 firstName: 'Max',
                 lastName: 'Mustermann',
                 password: 'Aa123456_',
-                language: 'de',
+                language: 'en',
               },
             }),
           )
diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue
index 89b539922..f08ea286e 100755
--- a/frontend/src/views/Pages/Register.vue
+++ b/frontend/src/views/Pages/Register.vue
@@ -225,7 +225,7 @@ export default {
       return this.form.email !== ''
     },
     languageFilled() {
-      return this.language !== null && this.language !== ''
+      return !!this.language
     },
   },
 }