DatseMultimediaSites
/
Sharkey
mirror of https://activitypub.software/TransFem-org/Sharkey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge: Minor improvements to relation badges on user profiles (!674) 

View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/674

Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
This commit is contained in:
Hazelnoot 2024-10-11 13:28:55 +00:00
parent fefdd1c1e8 a7076ed3e0
commit eb2ea85d40
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
locales/en-US.yml
View File

@ -271,6 +271,7 @@ defaultValueIs: "Default: {value}"
noCustomEmojis: "There are no emoji" noCustomEmojis: "There are no emoji"
noJobs: "There are no jobs" noJobs: "There are no jobs"
federating: "Federating" federating: "Federating"
blockingYou: "Blocking you"
blocked: "Blocked" blocked: "Blocked"
blockedByBase: "This host is blocked implicitly because a base domain is blocked. To unblock this host, first unblock the base domain(s)." blockedByBase: "This host is blocked implicitly because a base domain is blocked. To unblock this host, first unblock the base domain(s)."
silencedByBase: "This host is silenced implicitly because a base domain is silenced. To un-silence this host, first un-silence the base domain(s)." silencedByBase: "This host is silenced implicitly because a base domain is silenced. To un-silence this host, first un-silence the base domain(s)."

4
locales/index.d.ts vendored
View File

@ -1100,6 +1100,10 @@ export interface Locale extends ILocale {
* 連合中 * 連合中
*/ */
"federating": string; "federating": string;
/**
* Blocking you
*/
"blockingYou": string;
/** /**
* ブロック中 * ブロック中
*/ */

1
locales/ja-JP.yml
View File

@ -271,6 +271,7 @@ defaultValueIs: "デフォルト: {value}"
noCustomEmojis: "絵文字はありません" noCustomEmojis: "絵文字はありません"
noJobs: "ジョブはありません" noJobs: "ジョブはありません"
federating: "連合中" federating: "連合中"
blockingYou: "Blocking you"
blocked: "ブロック中" blocked: "ブロック中"
blockedByBase: "This host is blocked implicitly because a base domain is blocked. To unblock this host, first unblock the base domain(s)." blockedByBase: "This host is blocked implicitly because a base domain is blocked. To unblock this host, first unblock the base domain(s)."
silencedByBase: "This host is silenced implicitly because a base domain is silenced. To un-silence this host, first un-silence the base domain(s)." silencedByBase: "This host is silenced implicitly because a base domain is silenced. To un-silence this host, first un-silence the base domain(s)."

20
packages/frontend/src/pages/user/home.vue
View File

@ -30,12 +30,15 @@ SPDX-License-Identifier: AGPL-3.0-only
</button> </button>
</div> </div>
</div> </div>
<div v-if="$i && $i.id != user.id" class="info-badges"> <ul v-if="$i && $i.id != user.id" class="info-badges">
<span v-if="user.isFollowed">{{ i18n.ts.followsYou }}</span> <li v-if="user.isFollowed && user.isFollowing">{{ i18n.ts.mutuals }}</li>
<span v-if="user.isMuted">{{ i18n.ts.muted }}</span> <li v-else-if="user.isFollowing">{{ i18n.ts.following }}</li>
<span v-if="user.isRenoteMuted">{{ i18n.ts.renoteMuted }}</span> <li v-else-if="user.isFollowed">{{ i18n.ts.followsYou }}</li>
<span v-if="user.isBlocking">{{ i18n.ts.blocked }}</span> <li v-if="user.isMuted">{{ i18n.ts.muted }}</li>
</div> <li v-if="user.isRenoteMuted">{{ i18n.ts.renoteMuted }}</li>
<li v-if="user.isBlocking">{{ i18n.ts.blocked }}</li>
<li v-if="user.isBlocked && $i.isModerator">{{ i18n.ts.blockingYou }}</li>
</ul>
<div class="actions"> <div class="actions">
<button class="menu _button" @click="menu"><i class="ti ti-dots"></i></button> <button class="menu _button" @click="menu"><i class="ti ti-dots"></i></button>
<MkFollowButton v-if="$i?.id != user.id" v-model:user="user" :inline="true" :transparent="false" :full="true" class="koudoku"/> <MkFollowButton v-if="$i?.id != user.id" v-model:user="user" :inline="true" :transparent="false" :full="true" class="koudoku"/>
@ -469,12 +472,17 @@ onUnmounted(() => {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
padding: 0;
margin: 0;
> * { > * {
padding: 4px 8px; padding: 4px 8px;
color: #fff; color: #fff;
background: rgba(0, 0, 0, 0.7); background: rgba(0, 0, 0, 0.7);
font-size: 0.7em; font-size: 0.7em;
border-radius: var(--radius-sm); border-radius: var(--radius-sm);
list-style-type: none;
margin-left: 0;
} }
> :not(:first-child) { > :not(:first-child) {