mirror of
https://github.com/Ocelot-Social-Community/Ocelot-Social.git
synced 2025-12-13 07:46:06 +00:00
Merge pull request #2416 from Human-Connection/checkbox_no_comercial_add_to_creatUserAccount
Checkbox 'no comercial + no political account' add to creat user account
This commit is contained in:
commit
1b787d7687
@ -66,6 +66,8 @@ describe('CreateUserAccount', () => {
|
|||||||
wrapper.find('input#checkbox0').setChecked()
|
wrapper.find('input#checkbox0').setChecked()
|
||||||
wrapper.find('input#checkbox1').setChecked()
|
wrapper.find('input#checkbox1').setChecked()
|
||||||
wrapper.find('input#checkbox2').setChecked()
|
wrapper.find('input#checkbox2').setChecked()
|
||||||
|
wrapper.find('input#checkbox3').setChecked()
|
||||||
|
wrapper.find('input#checkbox4').setChecked()
|
||||||
await wrapper.find('form').trigger('submit')
|
await wrapper.find('form').trigger('submit')
|
||||||
await wrapper.html()
|
await wrapper.html()
|
||||||
}
|
}
|
||||||
|
|||||||
@ -88,12 +88,33 @@
|
|||||||
v-html="$t('components.registration.signup.form.minimum-age')"
|
v-html="$t('components.registration.signup.form.minimum-age')"
|
||||||
></label>
|
></label>
|
||||||
</ds-text>
|
</ds-text>
|
||||||
|
<ds-text>
|
||||||
|
<input id="checkbox3" type="checkbox" v-model="noCommercial" :checked="noCommercial" />
|
||||||
|
<label
|
||||||
|
for="checkbox3"
|
||||||
|
v-html="$t('components.registration.signup.form.no-commercial')"
|
||||||
|
></label>
|
||||||
|
</ds-text>
|
||||||
|
<ds-text>
|
||||||
|
<input id="checkbox4" type="checkbox" v-model="noPolitical" :checked="noPolitical" />
|
||||||
|
<label
|
||||||
|
for="checkbox4"
|
||||||
|
v-html="$t('components.registration.signup.form.no-political')"
|
||||||
|
></label>
|
||||||
|
</ds-text>
|
||||||
<ds-button
|
<ds-button
|
||||||
style="float: right;"
|
style="float: right;"
|
||||||
icon="check"
|
icon="check"
|
||||||
type="submit"
|
type="submit"
|
||||||
:loading="$apollo.loading"
|
:loading="$apollo.loading"
|
||||||
:disabled="errors || !termsAndConditionsConfirmed || !dataPrivacy || !minimumAge"
|
:disabled="
|
||||||
|
errors ||
|
||||||
|
!termsAndConditionsConfirmed ||
|
||||||
|
!dataPrivacy ||
|
||||||
|
!minimumAge ||
|
||||||
|
!noCommercial ||
|
||||||
|
!noPolitical
|
||||||
|
"
|
||||||
primary
|
primary
|
||||||
>
|
>
|
||||||
{{ $t('actions.save') }}
|
{{ $t('actions.save') }}
|
||||||
@ -145,6 +166,8 @@ export default {
|
|||||||
termsAndConditionsConfirmed: false,
|
termsAndConditionsConfirmed: false,
|
||||||
dataPrivacy: false,
|
dataPrivacy: false,
|
||||||
minimumAge: false,
|
minimumAge: false,
|
||||||
|
noCommercial: false,
|
||||||
|
noPolitical: false,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
|
|||||||
@ -550,6 +550,8 @@
|
|||||||
"terms-and-condition": "Ich stimme den <a href=\"\/terms-and-conditions\"><ds-text bold color=\"primary\" > Nutzungsbedingungen<\/ds-text><\/a>zu.",
|
"terms-and-condition": "Ich stimme den <a href=\"\/terms-and-conditions\"><ds-text bold color=\"primary\" > Nutzungsbedingungen<\/ds-text><\/a>zu.",
|
||||||
"data-privacy": "Ich habe die <a href=\"https:\/\/human-connection.org\/datenschutz\/\" target=\"_blank\"><ds-text bold color=\"primary\" >Datenschutzerklärung<\/ds-text><\/a> gelesen und verstanden",
|
"data-privacy": "Ich habe die <a href=\"https:\/\/human-connection.org\/datenschutz\/\" target=\"_blank\"><ds-text bold color=\"primary\" >Datenschutzerklärung<\/ds-text><\/a> gelesen und verstanden",
|
||||||
"minimum-age": "Ich bin 18 Jahre oder älter.",
|
"minimum-age": "Ich bin 18 Jahre oder älter.",
|
||||||
|
"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: <b>{code}<\/b>",
|
"invitation-code": "Dein Einladungscode lautet: <b>{code}<\/b>",
|
||||||
"errors": {
|
"errors": {
|
||||||
"email-exists": "Es gibt schon ein Benutzerkonto mit dieser E-Mail Adresse!",
|
"email-exists": "Es gibt schon ein Benutzerkonto mit dieser E-Mail Adresse!",
|
||||||
|
|||||||
@ -34,6 +34,8 @@
|
|||||||
"terms-and-condition": "I confirm to the <a href=\"/terms-and-conditions\"><ds-text bold color=\"primary\" > Terms and conditions</ds-text></a>.",
|
"terms-and-condition": "I confirm to the <a href=\"/terms-and-conditions\"><ds-text bold color=\"primary\" > Terms and conditions</ds-text></a>.",
|
||||||
"data-privacy": " I have read and understood the <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"><ds-text bold color=\"primary\" >Privacy Statement</ds-text></a> ",
|
"data-privacy": " I have read and understood the <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"><ds-text bold color=\"primary\" >Privacy Statement</ds-text></a> ",
|
||||||
"minimum-age": "I'm 18 years or older.",
|
"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-political": "I am not on behalf of a party or political organization in the network.",
|
||||||
"invitation-code": "Your invitation code is: <b>{code}</b>",
|
"invitation-code": "Your invitation code is: <b>{code}</b>",
|
||||||
"errors": {
|
"errors": {
|
||||||
"email-exists": "There is already a user account with this e-mail address!",
|
"email-exists": "There is already a user account with this e-mail address!",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user