diff options
| author | Henry Jameson <me@hjkos.com> | 2019-03-27 22:24:38 +0200 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2019-03-27 22:24:38 +0200 |
| commit | 66ab131bd431f955814d0c85e8d9445fc8e46c51 (patch) | |
| tree | 79eeb566c57664b3214dd8088b27b88de6ea693a /src/components | |
| parent | c2c7e12aadda0ca78f1b0e3789d19bdb6784d89f (diff) | |
| parent | 4d66b9cf45c3ae2c965347860383767921f5eb55 (diff) | |
Merge remote-tracking branch 'upstream/develop' into mastoapi/actions
* upstream/develop:
errata
review
Revert "Merge branch 'revert-987b5162' into 'develop'"
Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
Add await to login action'
correctly paginate on MastoAPI
#442 - update placeholder linebreak
#442 - clean up Bio placeholder text
wip support for follower/following, a bit broken and with regression
switch direct messages to mastoapi
switch public and TWKN to MastoAPI
undo this change since BE returns empty object for relationship, add in a separate MR
updates normalizer for proper user handling and adds support for friends tl via mastoapi
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 }"> |