pleroma-fe

commit: dcca4617d5647e0570b359c4e1b14737c552bc7b
parent: ad56c8e5bd3f62829b7ccfac285a10425dcbb57a
Author: HJ <spam@hjkos.com>
Date:   Thu, 13 Dec 2018 19:56:22 +0000

Merge branch 'dev_vald_fe/its_you' into 'develop'

added condition to check for login user in user search

Closes #182

See merge request pleroma/pleroma-fe!417
Diffstat:
M
src/components/user_card/user_card.js
3
+++
M
src/components/user_card/user_card.vue
4
++--
M
src/i18n/en.json
1
+

3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
@@ -14,6 +14,9 @@ const UserCard = {
   components: {
     UserCardContent
   },
+  computed: {
+    currentUser () { return this.$store.state.users.currentUser }
+  },
   methods: {
     toggleUserExpanded () {
       this.userExpanded = !this.userExpanded
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
@@ -10,13 +10,13 @@
       <div :title="user.name" v-if="user.name_html" class="user-name">
         <span v-html="user.name_html"></span>
         <span class="follows-you" v-if="!userExpanded && showFollows && user.follows_you">
-          {{ $t('user_card.follows_you') }}
+          {{ currentUser.id == user.id ? $t('user_card.its_you') : $t('user_card.follows_you') }}
         </span>
       </div>
       <div :title="user.name" v-else class="user-name">
         {{ user.name }}
         <span class="follows-you" v-if="!userExpanded && showFollows && user.follows_you">
-          {{ $t('user_card.follows_you') }}
+          {{ currentUser.id == user.id ? $t('user_card.its_you') : $t('user_card.follows_you') }}
         </span>
       </div>
       <router-link class='user-screen-name' :to="{ name: 'user-profile', params: { id: user.id } }">
diff --git a/src/i18n/en.json b/src/i18n/en.json
@@ -324,6 +324,7 @@
     "followers": "Followers",
     "following": "Following!",
     "follows_you": "Follows you!",
+    "its_you": "It's you!",
     "mute": "Mute",
     "muted": "Muted",
     "per_day": "per day",