aboutsummaryrefslogtreecommitdiff
path: root/src/components/registration
diff options
context:
space:
mode:
authorshpuld <shp@cock.li>2019-03-28 22:25:40 +0200
committershpuld <shp@cock.li>2019-03-28 22:25:40 +0200
commit31010779f6cc1abdd18fa117c0832e20623e1624 (patch)
tree2eaf8861e1baee86a1f4d33e0e10543e62cdd98c /src/components/registration
parentfd12263cacd2a869ad61dd8580f918b45d9b2a51 (diff)
parentc829b1a5f4a013882ba298b0f95ec0f8b3ed3758 (diff)
Merge branch 'develop' into feature/mobile-improvements-3
Diffstat (limited to 'src/components/registration')
-rw-r--r--src/components/registration/registration.js3
-rw-r--r--src/components/registration/registration.vue2
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 }">