From 38c58af1f3366f9179cdc27bb2e213def7b1084a Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 3 Dec 2019 17:57:30 +0100 Subject: [PATCH 1/3] add confirm checkboc No Comercial account --- webapp/components/Registration/CreateUserAccount.vue | 10 +++++++++- webapp/locales/de.json | 1 + webapp/locales/en.json | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/webapp/components/Registration/CreateUserAccount.vue b/webapp/components/Registration/CreateUserAccount.vue index 00466a2d3..828cf7530 100644 --- a/webapp/components/Registration/CreateUserAccount.vue +++ b/webapp/components/Registration/CreateUserAccount.vue @@ -88,12 +88,19 @@ v-html="$t('components.registration.signup.form.minimum-age')" > + + + + {{ $t('actions.save') }} @@ -145,6 +152,7 @@ export default { termsAndConditionsConfirmed: false, dataPrivacy: false, minimumAge: false, + minimumAge: false, } }, props: { diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 9f1f2d928..168ecc63f 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -495,6 +495,7 @@ "terms-and-condition": "Ich stimme den Nutzungsbedingungen<\/ds-text><\/a>zu.", "data-privacy": "Ich habe die Datenschutzerklärung<\/ds-text><\/a> gelesen und verstanden", "minimum-age": "Ich bin 18 Jahre oder älter.", + "no-commercial": "Ich habe keine kommerziellen Absichten und ich representiere kein kommerzielles Unternehmen oder Organisation.", "invitation-code": "Dein Einladungscode lautet: {code}<\/b>", "errors": { "email-exists": "Es gibt schon ein Benutzerkonto mit dieser E-Mail Adresse!", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 474a2a983..19470a322 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -34,6 +34,7 @@ "terms-and-condition": "I confirm to the Terms and conditions.", "data-privacy": " I have read and understood the Privacy Statement ", "minimum-age": "I'm 18 years or older.", + "no-commercial": "I have no commercial interests and I am not representing a company or any other commercial organisation on the network", "invitation-code": "Your invitation code is: {code}", "errors": { "email-exists": "There is already a user account with this e-mail address!", From a5bbb06f77c3facc49057aa184c62089af927ebd Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 3 Dec 2019 18:27:05 +0100 Subject: [PATCH 2/3] fix Spec + lint --- .../Registration/CreateUserAccount.spec.js | 2 ++ .../Registration/CreateUserAccount.vue | 19 +++++++++++++++++-- webapp/locales/de.json | 1 + webapp/locales/en.json | 3 ++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/webapp/components/Registration/CreateUserAccount.spec.js b/webapp/components/Registration/CreateUserAccount.spec.js index 81f825956..8d1f1617d 100644 --- a/webapp/components/Registration/CreateUserAccount.spec.js +++ b/webapp/components/Registration/CreateUserAccount.spec.js @@ -66,6 +66,8 @@ describe('CreateUserAccount', () => { wrapper.find('input#checkbox0').setChecked() wrapper.find('input#checkbox1').setChecked() wrapper.find('input#checkbox2').setChecked() + wrapper.find('input#checkbox3').setChecked() + wrapper.find('input#checkbox4').setChecked() await wrapper.find('form').trigger('submit') await wrapper.html() } diff --git a/webapp/components/Registration/CreateUserAccount.vue b/webapp/components/Registration/CreateUserAccount.vue index 828cf7530..695d5cac9 100644 --- a/webapp/components/Registration/CreateUserAccount.vue +++ b/webapp/components/Registration/CreateUserAccount.vue @@ -95,12 +95,26 @@ v-html="$t('components.registration.signup.form.no-commercial')" > + + + + {{ $t('actions.save') }} @@ -152,7 +166,8 @@ export default { termsAndConditionsConfirmed: false, dataPrivacy: false, minimumAge: false, - minimumAge: false, + noCommercial: false, + noPolitical: false, } }, props: { diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 168ecc63f..c35d6d06e 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -496,6 +496,7 @@ "data-privacy": "Ich habe die Datenschutzerklärung<\/ds-text><\/a> gelesen und verstanden", "minimum-age": "Ich bin 18 Jahre oder älter.", "no-commercial": "Ich habe keine kommerziellen Absichten und ich representiere kein kommerzielles Unternehmen oder Organisation.", + "no-political": "Ich bin nicht im Auftrag einer Partei oder politischen Organisation im Netzwerk. ", "invitation-code": "Dein Einladungscode lautet: {code}<\/b>", "errors": { "email-exists": "Es gibt schon ein Benutzerkonto mit dieser E-Mail Adresse!", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 19470a322..b2698ff6a 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -34,7 +34,8 @@ "terms-and-condition": "I confirm to the Terms and conditions.", "data-privacy": " I have read and understood the Privacy Statement ", "minimum-age": "I'm 18 years or older.", - "no-commercial": "I have no commercial interests and I am not representing a company or any other commercial organisation on the network", + "no-commercial": "I have no commercial interests and I am not representing a company or any other commercial organisation on the network.", + "no-political": "I am not on behalf of a party or political organization in the network.", "invitation-code": "Your invitation code is: {code}", "errors": { "email-exists": "There is already a user account with this e-mail address!", From 8d93956de055119decdf4de50249d707073af5e3 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Tue, 3 Dec 2019 18:47:38 +0100 Subject: [PATCH 3/3] change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit change representiere repräsentiere --- webapp/locales/de.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/locales/de.json b/webapp/locales/de.json index c35d6d06e..086961448 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -495,7 +495,7 @@ "terms-and-condition": "Ich stimme den Nutzungsbedingungen<\/ds-text><\/a>zu.", "data-privacy": "Ich habe die Datenschutzerklärung<\/ds-text><\/a> gelesen und verstanden", "minimum-age": "Ich bin 18 Jahre oder älter.", - "no-commercial": "Ich habe keine kommerziellen Absichten und ich representiere kein kommerzielles Unternehmen oder Organisation.", + "no-commercial": "Ich habe keine kommerziellen Absichten und ich repräsentiere kein kommerzielles Unternehmen oder Organisation.", "no-political": "Ich bin nicht im Auftrag einer Partei oder politischen Organisation im Netzwerk. ", "invitation-code": "Dein Einladungscode lautet: {code}<\/b>", "errors": { @@ -755,4 +755,4 @@ "donate-now": "Jetzt spenden", "amount-of-total": "{amount} von {total} € erreicht" } -} \ No newline at end of file +}