diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-09-16 11:38:37 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-09-16 11:38:37 +0000 |
| commit | 1306fac38f46b5578d46cc6abd6168a3399886b1 (patch) | |
| tree | 9e92df60075bee0285e6b34d8b433cb6065f3b3f /src/components/user_card/user_card.vue | |
| parent | b33667a74342a9fc91386d12763b5c2f1101868a (diff) | |
| parent | 9b163d281670e0c0a589adce46727284fbcba0ad (diff) | |
Merge branch 'develop' into 'muting-fixes'
# Conflicts:
# src/components/status/status.js
Diffstat (limited to 'src/components/user_card/user_card.vue')
| -rw-r--r-- | src/components/user_card/user_card.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue index fc18e240..0b83cf16 100644 --- a/src/components/user_card/user_card.vue +++ b/src/components/user_card/user_card.vue @@ -135,13 +135,13 @@ <button class="btn btn-default btn-block" :disabled="followRequestInProgress" - :title="followRequestSent ? $t('user_card.follow_again') : ''" + :title="user.requested ? $t('user_card.follow_again') : ''" @click="followUser" > <template v-if="followRequestInProgress"> {{ $t('user_card.follow_progress') }} </template> - <template v-else-if="followRequestSent"> + <template v-else-if="user.requested"> {{ $t('user_card.follow_sent') }} </template> <template v-else> |