sjw
/
pleroma-fe
mirror of https://git.pleroma.social/sjw/pleroma-fe.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'from/develop/tusooa/1172-reg-indicator' into 'develop' 

Add optional/required indicator for registration fields

Closes #1172

See merge request pleroma/pleroma-fe!1543
This commit is contained in:
HJ 2022-08-01 11:48:52 +00:00
parent 3c9d6b0ff0 8a0f659a86
commit 3fc9673a7d
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/registration/registration.vue
View File

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

3
src/i18n/en.json
View File

@ -234,8 +234,9 @@
} }
}, },
"registration": { "registration": {
"bio": "Bio", "bio_optional": "Bio (optional)",
"email": "Email", "email": "Email",
"email_optional": "Email (optional)",
"fullname": "Display name", "fullname": "Display name",
"password_confirm": "Password confirmation", "password_confirm": "Password confirmation",
"registration": "Registration", "registration": "Registration",