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
This commit is contained in:
commit
dcca4617d5
|
@ -14,6 +14,9 @@ const UserCard = {
|
||||||
components: {
|
components: {
|
||||||
UserCardContent
|
UserCardContent
|
||||||
},
|
},
|
||||||
|
computed: {
|
||||||
|
currentUser () { return this.$store.state.users.currentUser }
|
||||||
|
},
|
||||||
methods: {
|
methods: {
|
||||||
toggleUserExpanded () {
|
toggleUserExpanded () {
|
||||||
this.userExpanded = !this.userExpanded
|
this.userExpanded = !this.userExpanded
|
||||||
|
|
|
@ -10,13 +10,13 @@
|
||||||
<div :title="user.name" v-if="user.name_html" class="user-name">
|
<div :title="user.name" v-if="user.name_html" class="user-name">
|
||||||
<span v-html="user.name_html"></span>
|
<span v-html="user.name_html"></span>
|
||||||
<span class="follows-you" v-if="!userExpanded && showFollows && user.follows_you">
|
<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>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div :title="user.name" v-else class="user-name">
|
<div :title="user.name" v-else class="user-name">
|
||||||
{{ user.name }}
|
{{ user.name }}
|
||||||
<span class="follows-you" v-if="!userExpanded && showFollows && user.follows_you">
|
<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>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<router-link class='user-screen-name' :to="{ name: 'user-profile', params: { id: user.id } }">
|
<router-link class='user-screen-name' :to="{ name: 'user-profile', params: { id: user.id } }">
|
||||||
|
|
|
@ -324,6 +324,7 @@
|
||||||
"followers": "Followers",
|
"followers": "Followers",
|
||||||
"following": "Following!",
|
"following": "Following!",
|
||||||
"follows_you": "Follows you!",
|
"follows_you": "Follows you!",
|
||||||
|
"its_you": "It's you!",
|
||||||
"mute": "Mute",
|
"mute": "Mute",
|
||||||
"muted": "Muted",
|
"muted": "Muted",
|
||||||
"per_day": "per day",
|
"per_day": "per day",
|
||||||
|
|
Loading…
Reference in New Issue