diff options
| author | Shpuld Shpludson <shp@cock.li> | 2022-01-09 18:37:01 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2022-01-09 18:37:01 +0000 |
| commit | b13d8f7e6339e877a38a28008630dc8ec64abcdf (patch) | |
| tree | 56e2103fcb52640a17847cb97a726f9d6d3198ee /src/components/follow_button/follow_button.js | |
| parent | 51d3d8d255de221f7ac99e41f2f8e56c7d6a21a9 (diff) | |
| parent | 756f7bf7c2ee1beb7b43227271942130fd03c7cb (diff) | |
Merge branch 'develop' into 'master'
Update MASTER for 2.4.2
See merge request pleroma/pleroma-fe!1421
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 95e7cb6b..df42692b 100644 --- a/src/components/follow_button/follow_button.js +++ b/src/components/follow_button/follow_button.js @@ -14,7 +14,7 @@ export default { if (this.inProgress || this.relationship.following) { return this.$t('user_card.follow_unfollow') } else if (this.relationship.requested) { - return this.$t('user_card.follow_again') + return this.$t('user_card.follow_cancel') } else { return this.$t('user_card.follow') } @@ -33,7 +33,7 @@ export default { }, methods: { onClick () { - this.relationship.following ? this.unfollow() : this.follow() + this.relationship.following || this.relationship.requested ? this.unfollow() : this.follow() }, follow () { this.inProgress = true |