diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-11-13 21:22:35 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-11-13 21:22:35 +0000 |
| commit | 1f42283b8dda0308480de6292995221e631c3989 (patch) | |
| tree | a84796e6bcd8e20770ac7b73917e499643bed78f | |
| parent | 3dae1cf39642a677f73d16d3a108f0d88475c36f (diff) | |
| parent | 58839ecef895bbf7cf5fd94ed048a0736ee951fe (diff) | |
Merge branch 'friend-follower-count-display' into 'develop'
Show "Hidden" instead of zero when followers/following counts are hidden
See merge request pleroma/pleroma-fe!993
| -rw-r--r-- | src/components/user_card/user_card.js | 6 | ||||
| -rw-r--r-- | src/components/user_card/user_card.vue | 4 | ||||
| -rw-r--r-- | src/i18n/en.json | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js index cc8a1ed6..a9278200 100644 --- a/src/components/user_card/user_card.js +++ b/src/components/user_card/user_card.js @@ -93,6 +93,12 @@ export default { const roleTitle = rights.admin ? 'admin' : 'moderator' return validRole && roleTitle }, + hideFollowsCount () { + return this.isOtherUser && this.user.hide_follows_count + }, + hideFollowersCount () { + return this.isOtherUser && this.user.hide_followers_count + }, ...mapGetters(['mergedConfig']) }, components: { diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue index 6f3c958e..96acf610 100644 --- a/src/components/user_card/user_card.vue +++ b/src/components/user_card/user_card.vue @@ -208,14 +208,14 @@ @click.prevent="setProfileView('friends')" > <h5>{{ $t('user_card.followees') }}</h5> - <span>{{ user.friends_count }}</span> + <span>{{ hideFollowsCount ? $t('user_card.hidden') : user.friends_count }}</span> </div> <div class="user-count" @click.prevent="setProfileView('followers')" > <h5>{{ $t('user_card.followers') }}</h5> - <span>{{ user.followers_count }}</span> + <span>{{ hideFollowersCount ? $t('user_card.hidden') : user.followers_count }}</span> </div> </div> <!-- eslint-disable vue/no-v-html --> diff --git a/src/i18n/en.json b/src/i18n/en.json index ead333c1..ad3e671d 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -569,6 +569,7 @@ "followers": "Followers", "following": "Following!", "follows_you": "Follows you!", + "hidden": "Hidden", "its_you": "It's you!", "media": "Media", "mention": "Mention", |