diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-11-28 11:17:27 +0000 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-11-28 11:17:27 +0000 |
| commit | eb25238a8eca0ef2adab4aab80de44375c086ed5 (patch) | |
| tree | ea246e1c8d4d2dbc79054c7d4750213beb1cfae7 /packages/frontend/src/components/MkUserPopup.vue | |
| parent | honour blocks and "signing required" for note versions (diff) | |
| parent | merge: Bump develop version (!789) (diff) | |
| download | sharkey-eb25238a8eca0ef2adab4aab80de44375c086ed5.tar.gz sharkey-eb25238a8eca0ef2adab4aab80de44375c086ed5.tar.bz2 sharkey-eb25238a8eca0ef2adab4aab80de44375c086ed5.zip | |
Merge branch 'develop' into feature/2024.10
Diffstat (limited to 'packages/frontend/src/components/MkUserPopup.vue')
| -rw-r--r-- | packages/frontend/src/components/MkUserPopup.vue | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/frontend/src/components/MkUserPopup.vue b/packages/frontend/src/components/MkUserPopup.vue index a5e70deed5..73e38bef09 100644 --- a/packages/frontend/src/components/MkUserPopup.vue +++ b/packages/frontend/src/components/MkUserPopup.vue @@ -14,7 +14,9 @@ SPDX-License-Identifier: AGPL-3.0-only <div v-if="showing" :class="$style.root" class="_popup _shadow" :style="{ zIndex, top: top + 'px', left: left + 'px' }" @mouseover="() => { emit('mouseover'); }" @mouseleave="() => { emit('mouseleave'); }"> <div v-if="user != null"> <div :class="$style.banner" :style="user.bannerUrl ? `background-image: url(${defaultStore.state.disableShowingAnimatedImages ? getStaticImageUrl(user.bannerUrl) : user.bannerUrl})` : ''"> - <span v-if="$i && $i.id != user.id && user.isFollowed" :class="$style.followed">{{ i18n.ts.followsYou }}</span> + <span v-if="$i && $i.id != user.id && user.isFollowed && user.isFollowing" :class="$style.followed">{{ i18n.ts.mutuals }}</span> + <span v-else-if="$i && $i.id != user.id && user.isFollowed" :class="$style.followed">{{ i18n.ts.followsYou }}</span> + <span v-else-if="$i && $i.id != user.id && user.isFollowing" :class="$style.followed">{{ i18n.ts.following }}</span> <span v-if="user.isLocked && $i && $i.id != user.id && !user.isFollowing" :title="i18n.ts.isLocked" :class="$style.locked"><i class="ph-lock ph-bold ph-lg"></i></span> </div> <svg viewBox="0 0 128 128" :class="$style.avatarBack"> |