Skip to content
Snippets Groups Projects
Commit e45dff0b authored by HJ's avatar HJ :fire:
Browse files

Merge branch 'tusooa/locale-reg' into 'develop'

Fix registration error with email language selected

Closes #1248

See merge request !1787
parents 7ae61f6b 65d78ced
No related branches found
No related tags found
2 merge requests!1861Update master branch,!1787Fix registration error with email language selected
Pipeline #43828 passed
......@@ -16,7 +16,7 @@ const registration = {
confirm: '',
birthday: '',
reason: '',
language: ''
language: ['']
},
captcha: {}
}),
......@@ -100,7 +100,7 @@ const registration = {
this.user.captcha_token = this.captcha.token
this.user.captcha_answer_data = this.captcha.answer_data
if (this.user.language) {
this.user.language = localeService.internalToBackendLocale(this.user.language)
this.user.language = localeService.internalToBackendLocaleMulti(this.user.language.filter(k => k))
}
this.v$.$touch()
......
......@@ -210,6 +210,7 @@
:prompt-text="$t('registration.email_language')"
:language="v$.user.language.$model"
:set-language="val => v$.user.language.$model = val"
@click.stop.prevent
/>
</div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment