diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-27 19:48:41 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-27 19:48:41 +0000 |
| commit | ea50f55148f059549a586fb136eaa62963e33e66 (patch) | |
| tree | c8178a76a0f7a5cf4817abeae8ab263375683e6d /src/components | |
| parent | 72749834f3c82847dd8b584cb0e0622a25f292f8 (diff) | |
| parent | 3870adf51ff736617f48619d16553010d5e9c9b0 (diff) | |
Merge branch 'develop' into 'masto-api/direct'
# Conflicts:
# src/services/api/api.service.js
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/registration/registration.js | 3 | ||||
| -rw-r--r-- | src/components/registration/registration.vue | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js index ab6cd64d..8dc00420 100644 --- a/src/components/registration/registration.js +++ b/src/components/registration/registration.js @@ -35,6 +35,9 @@ const registration = { }, computed: { token () { return this.$route.params.token }, + bioPlaceholder () { + return this.$t('registration.bio_placeholder').replace(/\s*\n\s*/g, ' \n') + }, ...mapState({ registrationOpen: (state) => state.instance.registrationOpen, signedIn: (state) => !!state.users.currentUser, diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue index e22b308d..110b27bf 100644 --- a/src/components/registration/registration.vue +++ b/src/components/registration/registration.vue @@ -45,7 +45,7 @@ <div class='form-group'> <label class='form--label' for='bio'>{{$t('registration.bio')}} ({{$t('general.optional')}})</label> - <textarea :disabled="isPending" v-model='user.bio' class='form-control' id='bio' :placeholder="$t('registration.bio_placeholder')"></textarea> + <textarea :disabled="isPending" v-model='user.bio' class='form-control' id='bio' :placeholder="bioPlaceholder"></textarea> </div> <div class='form-group' :class="{ 'form-group--error': $v.user.password.$error }"> |