pleroma-fe

commit: e45dff0b269a56ee576ef0d23e23a1d76f04bc54
parent 7ae61f6bd5dc0c3059e85114e5079c3618d43b1b
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date:   Mon, 13 Feb 2023 02:17:45 +0000

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

Fix registration error with email language selected

Closes #1248

See merge request pleroma/pleroma-fe!1787
Diffstat:
M
src/components/registration/registration.js
4
++--
M
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
@@ -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
@@ -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>