diff --git a/webapp/components/Registration/RegistrationSlideCreate.vue b/webapp/components/Registration/RegistrationSlideCreate.vue
index e311fad59..63b0d23a7 100644
--- a/webapp/components/Registration/RegistrationSlideCreate.vue
+++ b/webapp/components/Registration/RegistrationSlideCreate.vue
@@ -73,22 +73,41 @@
:checked="termsAndConditionsConfirmed"
/>
-
+
-
+
@@ -156,10 +175,11 @@ export default {
// Integrate termsAndConditionsConfirmed into `this.formData` once we
// have checkmarks available.
termsAndConditionsConfirmed: false,
- dataPrivacy: false,
- minimumAge: false,
- noCommercial: false,
- noPolitical: false,
+ recieveCommunicationAsEmailsEtcConfirmed: false,
+ // Wolle dataPrivacy: false,
+ // minimumAge: false,
+ // noCommercial: false,
+ // noPolitical: false,
}
},
mounted: function () {
@@ -179,18 +199,22 @@ export default {
.termsAndConditionsConfirmed
? this.sliderData.collectedInputData.termsAndConditionsConfirmed
: false
- this.dataPrivacy = this.sliderData.collectedInputData.dataPrivacy
- ? this.sliderData.collectedInputData.dataPrivacy
- : false
- this.minimumAge = this.sliderData.collectedInputData.minimumAge
- ? this.sliderData.collectedInputData.minimumAge
- : false
- this.noCommercial = this.sliderData.collectedInputData.noCommercial
- ? this.sliderData.collectedInputData.noCommercial
- : false
- this.noPolitical = this.sliderData.collectedInputData.noPolitical
- ? this.sliderData.collectedInputData.noPolitical
+ this.recieveCommunicationAsEmailsEtcConfirmed = this.sliderData.collectedInputData
+ .recieveCommunicationAsEmailsEtcConfirmed
+ ? this.sliderData.collectedInputData.recieveCommunicationAsEmailsEtcConfirmed
: false
+ // Wolle this.dataPrivacy = this.sliderData.collectedInputData.dataPrivacy
+ // ? this.sliderData.collectedInputData.dataPrivacy
+ // : false
+ // this.minimumAge = this.sliderData.collectedInputData.minimumAge
+ // ? this.sliderData.collectedInputData.minimumAge
+ // : false
+ // this.noCommercial = this.sliderData.collectedInputData.noCommercial
+ // ? this.sliderData.collectedInputData.noCommercial
+ // : false
+ // this.noPolitical = this.sliderData.collectedInputData.noPolitical
+ // ? this.sliderData.collectedInputData.noPolitical
+ // : false
this.sendValidation()
this.sliderData.setSliderValuesCallback(this.validInput, {
@@ -205,10 +229,11 @@ export default {
this.formData.password.length >= 1 &&
this.formData.password === this.formData.passwordConfirmation &&
this.termsAndConditionsConfirmed &&
- this.dataPrivacy &&
- this.minimumAge &&
- this.noCommercial &&
- this.noPolitical
+ this.recieveCommunicationAsEmailsEtcConfirmed
+ // Wolle this.dataPrivacy &&
+ // this.minimumAge &&
+ // this.noCommercial &&
+ // this.noPolitical
)
},
},
@@ -216,28 +241,32 @@ export default {
termsAndConditionsConfirmed() {
this.sendValidation()
},
- dataPrivacy() {
- this.sendValidation()
- },
- minimumAge() {
- this.sendValidation()
- },
- noCommercial() {
- this.sendValidation()
- },
- noPolitical() {
+ recieveCommunicationAsEmailsEtcConfirmed() {
this.sendValidation()
},
+ // Wolle dataPrivacy() {
+ // this.sendValidation()
+ // },
+ // minimumAge() {
+ // this.sendValidation()
+ // },
+ // noCommercial() {
+ // this.sendValidation()
+ // },
+ // noPolitical() {
+ // this.sendValidation()
+ // },
},
methods: {
sendValidation() {
const { name, password, passwordConfirmation } = this.formData
const {
termsAndConditionsConfirmed,
- dataPrivacy,
- minimumAge,
- noCommercial,
- noPolitical,
+ recieveCommunicationAsEmailsEtcConfirmed,
+ // Wolle dataPrivacy,
+ // minimumAge,
+ // noCommercial,
+ // noPolitical,
} = this
this.sliderData.setSliderValuesCallback(this.validInput, {
@@ -246,10 +275,11 @@ export default {
password,
passwordConfirmation,
termsAndConditionsConfirmed,
- dataPrivacy,
- minimumAge,
- noCommercial,
- noPolitical,
+ recieveCommunicationAsEmailsEtcConfirmed,
+ // dataPrivacy,
+ // minimumAge,
+ // noCommercial,
+ // noPolitical,
},
})
},
diff --git a/webapp/components/Registration/RegistrationSlideEmail.vue b/webapp/components/Registration/RegistrationSlideEmail.vue
index 75c1dfec5..b580aa7dd 100644
--- a/webapp/components/Registration/RegistrationSlideEmail.vue
+++ b/webapp/components/Registration/RegistrationSlideEmail.vue
@@ -35,7 +35,6 @@
diff --git a/webapp/components/Registration/RegistrationSlideInvite.vue b/webapp/components/Registration/RegistrationSlideInvite.vue
index 3217f19eb..1e26cbbe8 100644
--- a/webapp/components/Registration/RegistrationSlideInvite.vue
+++ b/webapp/components/Registration/RegistrationSlideInvite.vue
@@ -45,7 +45,7 @@ export default {
// min: 6,
// max: 6,
required: true,
- message: this.$t('components.enter-invite.form.validations.length'),
+ // Wolle don't mention the amount of chars (remove from locales) message: this.$t('components.enter-invite.form.validations.length'),
},
},
dbRequestInProgress: false,
diff --git a/webapp/components/Registration/RegistrationSlider.story.js b/webapp/components/Registration/RegistrationSlider.story.js
index d224a80cb..136a06d2c 100644
--- a/webapp/components/Registration/RegistrationSlider.story.js
+++ b/webapp/components/Registration/RegistrationSlider.story.js
@@ -101,10 +101,11 @@ storiesOf('RegistrationSlider', module)
password: 'Hello',
passwordConfirmation: 'Hello',
termsAndConditionsConfirmed: true,
- dataPrivacy: true,
- minimumAge: true,
- noCommercial: true,
- noPolitical: true,
+ recieveCommunicationAsEmailsEtcConfirmed: true,
+ // Wolle dataPrivacy: true,
+ // minimumAge: true,
+ // noCommercial: true,
+ // noPolitical: true,
},
},
}),
@@ -134,10 +135,11 @@ storiesOf('RegistrationSlider', module)
password: 'Hello',
passwordConfirmation: 'Hello',
termsAndConditionsConfirmed: true,
- dataPrivacy: true,
- minimumAge: true,
- noCommercial: true,
- noPolitical: true,
+ recieveCommunicationAsEmailsEtcConfirmed: true,
+ // Wolle dataPrivacy: true,
+ // minimumAge: true,
+ // noCommercial: true,
+ // noPolitical: true,
},
},
}),
@@ -159,10 +161,11 @@ storiesOf('RegistrationSlider', module)
password: null,
passwordConfirmation: null,
termsAndConditionsConfirmed: null,
- dataPrivacy: null,
- minimumAge: null,
- noCommercial: null,
- noPolitical: null,
+ recieveCommunicationAsEmailsEtcConfirmed: null,
+ // Wolle dataPrivacy: null,
+ // minimumAge: null,
+ // noCommercial: null,
+ // noPolitical: null,
},
},
}),
@@ -184,10 +187,11 @@ storiesOf('RegistrationSlider', module)
password: 'Hello',
passwordConfirmation: 'Hello',
termsAndConditionsConfirmed: true,
- dataPrivacy: true,
- minimumAge: true,
- noCommercial: true,
- noPolitical: true,
+ recieveCommunicationAsEmailsEtcConfirmed: true,
+ // Wolle dataPrivacy: true,
+ // minimumAge: true,
+ // noCommercial: true,
+ // noPolitical: true,
},
},
}),
diff --git a/webapp/components/Registration/RegistrationSlider.vue b/webapp/components/Registration/RegistrationSlider.vue
index 0809b5375..549c334fe 100644
--- a/webapp/components/Registration/RegistrationSlider.vue
+++ b/webapp/components/Registration/RegistrationSlider.vue
@@ -176,10 +176,11 @@ export default {
password: null,
passwordConfirmation: null,
termsAndConditionsConfirmed: null,
- dataPrivacy: null,
- minimumAge: null,
- noCommercial: null,
- noPolitical: null,
+ recieveCommunicationAsEmailsEtcConfirmed: null,
+ // Wolle dataPrivacy: null,
+ // minimumAge: null,
+ // noCommercial: null,
+ // noPolitical: null,
},
sliderIndex: 0,
sliders: sliders,
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 90adf65fc..ecb13794e 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -170,7 +170,9 @@
"buttonTitle": "Erstellen",
"error": "Es konnte kein Benutzerkonto erstellt werden!",
"help": "Vielleicht war der Bestätigungscode falsch oder abgelaufen? Wenn das Problem weiterhin besteht, schicke uns gerne eine E-Mail an:",
+ "recieveCommunicationAsEmailsEtcConfirmed": "Ich stimme auch dem Erhalt von E-Mails und anderen Formen der Kommunikation (z.B. Push-Benachrichtigungen) zu.",
"success": "Dein Benutzerkonto wurde erstellt!",
+ "termsAndCondsEtcConfirmed": "Ich habe folgendes gelesen, verstanden und stimme zu:",
"title": "Benutzerkonto anlegen"
},
"email": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index d21c1f96a..b5cd77202 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -170,7 +170,9 @@
"buttonTitle": "Create",
"error": "No user account could be created!",
"help": " Maybe the confirmation was invalid? In case of problems, feel free to ask for help by sending us a mail to:",
+ "recieveCommunicationAsEmailsEtcConfirmed": "I also agree to receive e-mails and other forms of communication (e.g. push notifications).",
"success": "Your account has been created!",
+ "termsAndCondsEtcConfirmed": "I have read, understand and agree to the following:",
"title": "Create user account"
},
"email": {