diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2023-02-13 02:17:45 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2023-02-13 02:17:45 +0000 |
| commit | e45dff0b269a56ee576ef0d23e23a1d76f04bc54 (patch) | |
| tree | 25c59135d77c65668a7a51081dcfabed1def5989 /src | |
| parent | 7ae61f6bd5dc0c3059e85114e5079c3618d43b1b (diff) | |
| parent | 65d78ced93aab31217a74624cb313be6ff7114f9 (diff) | |
Merge branch 'tusooa/locale-reg' into 'develop'
Fix registration error with email language selected
Closes #1248
See merge request pleroma/pleroma-fe!1787
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/registration/registration.js | 4 | ||||
| -rw-r--r-- | src/components/registration/registration.vue | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js index 22ca6ad6..b88bdeec 100644 --- a/src/components/registration/registration.js +++ b/src/components/registration/registration.js @@ -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() diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue index 5701b05e..7438a5f4 100644 --- a/src/components/registration/registration.vue +++ b/src/components/registration/registration.vue @@ -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> |