diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-10-17 19:03:07 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-10-17 19:03:07 +0000 |
| commit | 051e6ea5ca8be5231d66e577a7e5407b53e08f61 (patch) | |
| tree | bb60518900af3f99a4c10cc209037e8937c8f569 /src/components/follow_button/follow_button.js | |
| parent | 835bbd8b5f8a2bfdf5658fb8698d81832be349fa (diff) | |
| parent | b3f590ceb3e2710b278093a7246a3bf53c9aaafd (diff) | |
Merge branch 'issue/684' into 'develop'
[#684] updated FollowCard component
See merge request pleroma/pleroma-fe!972
Diffstat (limited to 'src/components/follow_button/follow_button.js')
| -rw-r--r-- | src/components/follow_button/follow_button.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/follow_button/follow_button.js b/src/components/follow_button/follow_button.js index 4123c9fd..12da2645 100644 --- a/src/components/follow_button/follow_button.js +++ b/src/components/follow_button/follow_button.js @@ -1,6 +1,6 @@ import { requestFollow, requestUnfollow } from '../../services/follow_manipulate/follow_manipulate' export default { - props: ['user'], + props: ['user', 'labelFollowing', 'buttonClass'], data () { return { inProgress: false @@ -23,7 +23,7 @@ export default { if (this.inProgress) { return this.$t('user_card.follow_progress') } else if (this.user.following) { - return this.$t('user_card.following') + return this.labelFollowing || this.$t('user_card.following') } else if (this.user.requested) { return this.$t('user_card.follow_sent') } else { |