Merge branch 'tusooa/locale-reg' into 'develop'
Fix registration error with email language selected Closes #1248 See merge request pleroma/pleroma-fe!1787
This commit is contained in:
commit
e45dff0b26
2 changed files with 3 additions and 2 deletions
|
@ -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>
|
||||
|
||||
|
|
Loading…
Reference in a new issue