Page Menu
Home
Phorge
Search
Configure Global Search
Log In
Files
F115184
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Award Token
Flag For Later
Size
2 KB
Referenced Files
None
Subscribers
None
View Options
diff --git a/changelog.d/multiple-status-mute-reasons.fix b/changelog.d/multiple-status-mute-reasons.fix
new file mode 100644
index 00000000..952ccea8
--- /dev/null
+++ b/changelog.d/multiple-status-mute-reasons.fix
@@ -0,0 +1 @@
+Fix whitespaces for multiple status mute reasons, display bot status reason
diff --git a/src/components/notification/notification.scss b/src/components/notification/notification.scss
index 2dbced09..0ca6aea7 100644
--- a/src/components/notification/notification.scss
+++ b/src/components/notification/notification.scss
@@ -26,6 +26,7 @@
overflow: hidden;
display: flex;
flex-wrap: nowrap;
+ gap: 1ex;
& .status-username,
& .mute-thread,
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 63809ff2..344e4b8e 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -281,6 +281,7 @@
overflow: hidden;
display: flex;
flex-wrap: nowrap;
+ gap: 1ex;
& .status-username,
& .mute-thread,
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 61a58cda..7fef69df 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -37,16 +37,23 @@
{{ $t('status.sensitive_muted') }}
</small>
<small
- v-if="showReasonMutedThread"
+ v-if="muteBotStatuses && botStatus"
class="mute-thread"
>
- {{ $t('status.thread_muted') }}
+ {{ $t('status.bot_muted') }}
</small>
<small
- v-if="showReasonMutedThread && muteWordHits.length > 0"
+ v-if="showReasonMutedThread"
class="mute-thread"
>
- {{ $t('status.thread_muted_and_words') }}
+ <span>
+ {{ $t('status.thread_muted') }}
+ </span>
+ <span
+ v-if="muteWordHits.length > 0"
+ >
+ {{ $t('status.thread_muted_and_words') }}
+ </span>
</small>
<small
class="mute-words"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index e047cb79..685a0652 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1229,6 +1229,7 @@
"thread_muted": "Thread muted",
"thread_muted_and_words": ", has words:",
"sensitive_muted": "Muting sensitive content",
+ "bot_muted": "Muting bot content",
"show_full_subject": "Show full subject",
"hide_full_subject": "Hide full subject",
"show_content": "Show content",
File Metadata
Details
Attached
Mime Type
text/x-diff
Expires
Wed, Nov 27, 12:39 PM (1 d, 16 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40637
Default Alt Text
(2 KB)
Attached To
Mode
rPUFE pleroma-fe-upstream
Attached
Detach File
Event Timeline
Log In to Comment