Merge branch 'fix-mute-reasons-whitespaces' into 'develop'

Fix whitespaces for multiple status mute reasons, display bot status reason

See merge request pleroma/pleroma-fe!1948

changelog.d/multiple-status-mute-reasons.fix

@@ -0,0 +1 @@
+Fix whitespaces for multiple status mute reasons, display bot status reason

src/components/notification/notification.scss

@@ -26,6 +26,7 @@
     overflow: hidden;
     display: flex;
     flex-wrap: nowrap;
+    gap: 1ex;
 
     & .status-username,
     & .mute-thread,

src/components/status/status.scss

@@ -281,6 +281,7 @@
     overflow: hidden;
     display: flex;
     flex-wrap: nowrap;
+    gap: 1ex;
 
     & .status-username,
     & .mute-thread,

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"

src/i18n/en.json

@@ -1151,6 +1151,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",