From 949f47063b0114cd72630d3862df96429835f925 Mon Sep 17 00:00:00 2001
From: taehoon
Date: Tue, 12 Nov 2019 10:40:36 -0500
Subject: [PATCH 1/3] show N/A when count is hidden
---
src/components/user_card/user_card.js | 6 ++++++
src/components/user_card/user_card.vue | 4 ++--
2 files changed, 8 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..e54d30d4 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')"
>
{{ $t('user_card.followees') }}
- {{ user.friends_count }}
+ {{ hideFollowsCount ? 'N/A' : user.friends_count }}
{{ $t('user_card.followers') }}
- {{ user.followers_count }}
+ {{ hideFollowersCount ? 'N/A' : user.followers_count }}
From 85685d64788193f3f40ce14d3066c48c4523dde0 Mon Sep 17 00:00:00 2001
From: taehoon
Date: Tue, 12 Nov 2019 10:47:49 -0500
Subject: [PATCH 2/3] add a translation
---
src/components/user_card/user_card.vue | 4 ++--
src/i18n/en.json | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index e54d30d4..421a1236 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')"
>
{{ $t('user_card.followees') }}
- {{ hideFollowsCount ? 'N/A' : user.friends_count }}
+ {{ hideFollowsCount ? $t('user_card.na') : user.friends_count }}
{{ $t('user_card.followers') }}
- {{ hideFollowersCount ? 'N/A' : user.followers_count }}
+ {{ hideFollowersCount ? $t('user_card.na') : user.followers_count }}
diff --git a/src/i18n/en.json b/src/i18n/en.json
index ead333c1..b9519617 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -574,6 +574,7 @@
"mention": "Mention",
"mute": "Mute",
"muted": "Muted",
+ "na": "N/A",
"per_day": "per day",
"remote_follow": "Remote follow",
"report": "Report",
From 58839ecef895bbf7cf5fd94ed048a0736ee951fe Mon Sep 17 00:00:00 2001
From: taehoon
Date: Tue, 12 Nov 2019 13:31:30 -0500
Subject: [PATCH 3/3] change N/A to Hidden
---
src/components/user_card/user_card.vue | 4 ++--
src/i18n/en.json | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 421a1236..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')"
>
{{ $t('user_card.followees') }}
- {{ hideFollowsCount ? $t('user_card.na') : user.friends_count }}
+ {{ hideFollowsCount ? $t('user_card.hidden') : user.friends_count }}
{{ $t('user_card.followers') }}
- {{ hideFollowersCount ? $t('user_card.na') : user.followers_count }}
+ {{ hideFollowersCount ? $t('user_card.hidden') : user.followers_count }}
diff --git a/src/i18n/en.json b/src/i18n/en.json
index b9519617..ad3e671d 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -569,12 +569,12 @@
"followers": "Followers",
"following": "Following!",
"follows_you": "Follows you!",
+ "hidden": "Hidden",
"its_you": "It's you!",
"media": "Media",
"mention": "Mention",
"mute": "Mute",
"muted": "Muted",
- "na": "N/A",
"per_day": "per day",
"remote_follow": "Remote follow",
"report": "Report",