Merge remote-tracking branch 'origin/develop' into shigusegubu-vue3

* origin/develop:
  Update dependency vue-router to v4.1.3
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (French)
  Translated using Weblate (French)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (French)
  Translated using Weblate (French)
  Add optional/required indicator for registration fields
This commit is contained in:
Henry Jameson 2022-08-02 23:54:20 +03:00
commit 1bab44249b
6 changed files with 250 additions and 35 deletions

View file

@ -23,6 +23,7 @@
v-model.trim="v$.user.username.$model"
:disabled="isPending"
class="form-control"
:aria-required="true"
:placeholder="$t('registration.username_placeholder')"
>
</div>
@ -50,6 +51,7 @@
v-model.trim="v$.user.fullname.$model"
:disabled="isPending"
class="form-control"
:aria-required="true"
:placeholder="$t('registration.fullname_placeholder')"
>
</div>
@ -71,13 +73,14 @@
<label
class="form--label"
for="email"
>{{ $t('registration.email') }}</label>
>{{ accountActivationRequired ? $t('registration.email') : $t('registration.email_optional') }}</label>
<input
id="email"
v-model="v$.user.email.$model"
:disabled="isPending"
class="form-control"
type="email"
:aria-required="accountActivationRequired"
>
</div>
<div
@ -95,7 +98,7 @@
<label
class="form--label"
for="bio"
>{{ $t('registration.bio') }} ({{ $t('general.optional') }})</label>
>{{ $t('registration.bio_optional') }}</label>
<textarea
id="bio"
v-model="user.bio"
@ -119,6 +122,7 @@
:disabled="isPending"
class="form-control"
type="password"
:aria-required="true"
>
</div>
<div
@ -146,6 +150,7 @@
:disabled="isPending"
class="form-control"
type="password"
:aria-required="true"
>
</div>
<div