Merge e86721a4e0 into 14cb5ff881

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

app/helpers/statuses_helper.rb

@@ -37,7 +37,7 @@ module StatusesHelper
   def status_text_summary(status)
     return if status.spoiler_text.blank?
 
-    I18n.t('statuses.content_warning', warning: status.spoiler_text)
+    I18n.t('statuses.content_warning.warning', warning: status.spoiler_text)
   end
 
   def poll_summary(status)

app/javascript/mastodon/components/button/button.stories.tsx

@@ -8,6 +8,7 @@ const meta = {
   component: Button,
   args: {
     secondary: false,
+    plain: false,
     compact: false,
     dangerous: false,
     disabled: false,
@@ -57,6 +58,14 @@ export const Secondary: Story = {
   play: buttonTest,
 };
 
+export const Plain: Story = {
+  args: {
+    plain: true,
+    children: 'Plain button',
+  },
+  play: buttonTest,
+};
+
 export const Compact: Story = {
   args: {
     compact: true,
@@ -101,6 +110,14 @@ export const SecondaryDisabled: Story = {
   play: disabledButtonTest,
 };
 
+export const PlainDisabled: Story = {
+  args: {
+    ...Plain.args,
+    disabled: true,
+  },
+  play: disabledButtonTest,
+};
+
 const loadingButtonTest: Story['play'] = async ({
   args,
   canvas,

app/javascript/mastodon/components/button/index.tsx

@@ -9,6 +9,7 @@ interface BaseProps
   extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'children'> {
   block?: boolean;
   secondary?: boolean;
+  plain?: boolean;
   compact?: boolean;
   dangerous?: boolean;
   loading?: boolean;
@@ -35,6 +36,7 @@ export const Button: React.FC<Props> = ({
   disabled,
   block,
   secondary,
+  plain,
   compact,
   dangerous,
   loading,
@@ -62,6 +64,7 @@ export const Button: React.FC<Props> = ({
     <button
       className={classNames('button', className, {
         'button-secondary': secondary,
+        'button--plain': plain,
         'button--compact': compact,
         'button--block': block,
         'button--dangerous': dangerous,

app/javascript/styles/mastodon/admin.scss

@@ -1935,7 +1935,6 @@ a.sparkline {
 .status__card {
   padding: 15px;
   border-radius: 4px;
-  background: $ui-base-color;
   font-size: 15px;
   line-height: 20px;
   word-wrap: break-word;
@@ -1954,8 +1953,50 @@ a.sparkline {
   .status__content {
     padding-top: 0;
 
-    summary {
+    > details {
-      display: list-item;
+      summary {
+        display: block;
+        box-sizing: border-box;
+        background: var(--nested-card-background);
+        color: var(--nested-card-text);
+        border: var(--nested-card-border);
+        border-radius: 8px;
+        padding: 8px 13px;
+        position: relative;
+        font-size: 15px;
+        line-height: 22px;
+        cursor: pointer;
+
+        &::after {
+          content: attr(data-show, 'Show more');
+          margin-top: 8px;
+          display: block;
+          font-size: 15px;
+          line-height: 20px;
+          color: $highlight-text-color;
+          cursor: pointer;
+          border: 0;
+          background: transparent;
+          padding: 0;
+          text-decoration: none;
+          font-weight: 500;
+        }
+
+        &:hover,
+        &:focus-visible {
+          &::after {
+            text-decoration: underline !important;
+          }
+        }
+      }
+
+      &[open] summary {
+        margin-bottom: 16px;
+
+        &::after {
+          content: attr(data-hide, 'Hide post');
+        }
+      }
     }
   }
 }

app/javascript/styles/mastodon/components.scss

@@ -201,6 +201,41 @@
     }
   }
 
+  &.button--plain {
+    color: $highlight-text-color;
+    background: transparent;
+    padding: 6px;
+
+    // The button has no outline, so we use negative margin to
+    // visually align its label with its surroundings while maintaining
+    // a generous click target
+    margin-inline: -6px;
+    border: 1px solid transparent;
+
+    &:active,
+    &:focus,
+    &:hover {
+      border-color: transparent;
+      color: lighten($highlight-text-color, 4%);
+      background-color: transparent;
+      text-decoration: none;
+    }
+
+    &:disabled,
+    &.disabled {
+      opacity: 0.7;
+      border-color: transparent;
+      color: $ui-button-disabled-color;
+
+      &:active,
+      &:focus,
+      &:hover {
+        border-color: transparent;
+        color: $ui-button-disabled-color;
+      }
+    }
+  }
+
   &.button-tertiary {
     background: transparent;
     padding: 6px 17px;

app/serializers/activitypub/note_serializer.rb

@@ -232,6 +232,15 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
       canQuote: {
         automaticApproval: approved_uris,
       },
+      canReply: {
+        always: 'https://www.w3.org/ns/activitystreams#Public',
+      },
+      canLike: {
+        always: 'https://www.w3.org/ns/activitystreams#Public',
+      },
+      canAnnounce: {
+        always: 'https://www.w3.org/ns/activitystreams#Public',
+      },
     }
   end
 

app/views/admin/shared/_status_content.html.haml

@@ -1,8 +1,14 @@
 .status__content><
   - if status.spoiler_text.present?
     %details<
-      %summary><
+      %summary{
-        %strong> Content warning: #{prerender_custom_emojis(h(status.spoiler_text), status.emojis)}
+        data: {
+          show: t('statuses.content_warning.show'),
+          hide: t('statuses.content_warning.hide'),
+        }
+      }><
+        %strong>
+          = t('statuses.content_warning.warning', warning: prerender_custom_emojis(h(status.spoiler_text), status.emojis))
       = prerender_custom_emojis(status_content_format(status), status.emojis)
       = render partial: 'admin/shared/status_attachments', locals: { status: status.proper }
   - else

config/locales/af.yml

@@ -157,7 +157,8 @@ af:
     edit_profile: Redigeer profiel
     preferences: Voorkeure
   statuses:
-    content_warning: 'Inhoud waarskuwing: %{warning}'
+    content_warning:
+      warning: 'Inhoud waarskuwing: %{warning}'
     errors:
       in_reply_not_found: Die plasing waarop jy probeer reageer blyk nie te bestaan nie.
   statuses_cleanup:

config/locales/an.yml

@@ -1393,7 +1393,8 @@ an:
         one: "%{count} video"
         other: "%{count} videos"
     boosted_from_html: Empentau dende %{acct_link}
-    content_warning: 'Alerta de conteniu: %{warning}'
+    content_warning:
+      warning: 'Alerta de conteniu: %{warning}'
     default_language: Igual que l'idioma d'a interficie
     disallowed_hashtags:
       one: 'conteneba un hashtag no permitiu: %{tags}'

config/locales/ar.yml

@@ -2027,7 +2027,8 @@ ar:
         two: "%{count} فيديوهات"
         zero: "%{count} فيديوهات"
     boosted_from_html: تم إعادة ترقيته مِن %{acct_link}
-    content_warning: 'تحذير عن المحتوى: %{warning}'
+    content_warning:
+      warning: 'تحذير عن المحتوى: %{warning}'
     default_language: نفس لغة الواجهة
     disallowed_hashtags:
       few: 'يحتوي على وسوم غير مسموح بها: %{tags}'

config/locales/be.yml

@@ -1980,7 +1980,8 @@ be:
         one: "%{count} відэафайл"
         other: "%{count} відэафайла"
     boosted_from_html: Пашырыў уліковы запіс %{acct_link}
-    content_warning: 'Папярэджанне аб змесціве: %{warning}'
+    content_warning:
+      warning: 'Папярэджанне аб змесціве: %{warning}'
     default_language: Такая, што і мова інтэрфэйсу
     disallowed_hashtags:
       few: 'змяшчае недазволеныя хэштэгі: %{tags}'

config/locales/bg.yml

@@ -1876,7 +1876,8 @@ bg:
         one: "%{count} видео"
         other: "%{count} видеозаписа"
     boosted_from_html: Раздуто от %{acct_link}
-    content_warning: 'Предупреждение за съдържание: %{warning}'
+    content_warning:
+      warning: 'Предупреждение за съдържание: %{warning}'
     default_language: Същият като езика на интерфейса
     disallowed_hashtags:
       one: 'съдържа непозволен хаштаг: %{tags}'

config/locales/ca.yml

@@ -1866,7 +1866,8 @@ ca:
         one: "%{count} vídeo"
         other: "%{count} vídeos"
     boosted_from_html: Impulsat des de %{acct_link}
-    content_warning: 'Avís de contingut: %{warning}'
+    content_warning:
+      warning: 'Avís de contingut: %{warning}'
     default_language: El mateix que a la llengua de la interfície
     disallowed_hashtags:
       one: 'conté una etiqueta no permesa: %{tags}'

config/locales/ckb.yml

@@ -926,7 +926,8 @@ ckb:
         one: "%{count} ڤیدیۆ"
         other: "%{count} ڤیدیۆکان"
     boosted_from_html: توکراوەتەوە لەلایەن %{acct_link}
-    content_warning: 'ئاگاداری ناوەڕۆک: %{warning}'
+    content_warning:
+      warning: 'ئاگاداری ناوەڕۆک: %{warning}'
     disallowed_hashtags:
       one: 'هاشتاگی ڕێگەپێنەدراوەی تێدابوو: %{tags}'
       other: 'هاشتاگەکانی ڕێگەپێنەدراوەی تێدابوو: %{tags}'

config/locales/co.yml

@@ -910,7 +910,8 @@ co:
         one: "%{count} filmettu"
         other: "%{count} filmetti"
     boosted_from_html: Spartutu dapoi à %{acct_link}
-    content_warning: 'Avertimentu: %{warning}'
+    content_warning:
+      warning: 'Avertimentu: %{warning}'
     disallowed_hashtags:
       one: 'cuntene l’hashtag disattivatu: %{tags}'
       other: 'cuntene l’hashtag disattivati: %{tags}'

config/locales/cs.yml

@@ -1980,7 +1980,8 @@ cs:
         one: "%{count} video"
         other: "%{count} videí"
     boosted_from_html: Boostnuto z %{acct_link}
-    content_warning: 'Varování o obsahu: %{warning}'
+    content_warning:
+      warning: 'Varování o obsahu: %{warning}'
     default_language: Stejný jako jazyk rozhraní
     disallowed_hashtags:
       few: 'obsahoval zakázané hashtagy: %{tags}'

config/locales/cy.yml

@@ -2060,7 +2060,8 @@ cy:
         two: "%{count} fideo"
         zero: "%{count} fideo"
     boosted_from_html: Wedi'i hybu o %{acct_link}
-    content_warning: 'Rhybudd cynnwys: %{warning}'
+    content_warning:
+      warning: 'Rhybudd cynnwys: %{warning}'
     default_language: Yr un fath a'r iaith rhyngwyneb
     disallowed_hashtags:
       few: 'yn cynnwys yr hashnod gwaharddedig: %{tags}'

config/locales/da.yml

@@ -1896,7 +1896,8 @@ da:
         one: "%{count} video"
         other: "%{count} videoer"
     boosted_from_html: Fremhævet fra %{acct_link}
-    content_warning: 'Indholdsadvarsel: %{warning}'
+    content_warning:
+      warning: 'Indholdsadvarsel: %{warning}'
     default_language: Samme som UI-sproget
     disallowed_hashtags:
       one: 'indeholdte et ikke tilladt hashtag: %{tags}'

config/locales/de.yml

@@ -1896,7 +1896,8 @@ de:
         one: "%{count} Video"
         other: "%{count} Videos"
     boosted_from_html: Geteilt von %{acct_link}
-    content_warning: 'Inhaltswarnung: %{warning}'
+    content_warning:
+      warning: 'Inhaltswarnung: %{warning}'
     default_language: Wie die Sprache des Webinterface
     disallowed_hashtags:
       one: 'enthält einen nicht-erlaubten Hashtag: %{tags}'

config/locales/el.yml

@@ -1892,7 +1892,8 @@ el:
         one: "%{count} βίντεο"
         other: "%{count} βίντεο"
     boosted_from_html: Ενισχύθηκε από %{acct_link}
-    content_warning: 'Προειδοποίηση περιεχομένου: %{warning}'
+    content_warning:
+      warning: 'Προειδοποίηση περιεχομένου: %{warning}'
     default_language: Ίδια με γλώσσα διεπαφής
     disallowed_hashtags:
       one: 'περιέχει μη επιτρεπτή ετικέτα: %{tags}'

config/locales/en-GB.yml

@@ -1863,7 +1863,8 @@ en-GB:
         one: "%{count} video"
         other: "%{count} videos"
     boosted_from_html: Boosted from %{acct_link}
-    content_warning: 'Content warning: %{warning}'
+    content_warning:
+      warning: 'Content warning: %{warning}'
     default_language: Same as interface language
     disallowed_hashtags:
       one: 'contained a disallowed hashtag: %{tags}'

config/locales/en.yml

@@ -1897,7 +1897,10 @@ en:
         one: "%{count} video"
         other: "%{count} videos"
     boosted_from_html: Boosted from %{acct_link}
-    content_warning: 'Content warning: %{warning}'
+    content_warning:
+      hide: Hide post
+      show: Show more
+      warning: 'Content warning: %{warning}'
     default_language: Same as interface language
     disallowed_hashtags:
       one: 'contained a disallowed hashtag: %{tags}'

config/locales/eo.yml

@@ -1874,7 +1874,8 @@ eo:
         one: "%{count} video"
         other: "%{count} videoj"
     boosted_from_html: Diskonigita de %{acct_link}
-    content_warning: 'Averto pri enhavo: %{warning}'
+    content_warning:
+      warning: 'Averto pri enhavo: %{warning}'
     default_language: Sama lingvo kiel tiu de la interfaco
     disallowed_hashtags:
       one: 'enhavas malpermesitan kradvorton: %{tags}'

config/locales/es-AR.yml

@@ -1896,7 +1896,8 @@ es-AR:
         one: "%{count} video"
         other: "%{count} videos"
     boosted_from_html: Adherido desde %{acct_link}
-    content_warning: 'Advertencia de contenido: %{warning}'
+    content_warning:
+      warning: 'Advertencia de contenido: %{warning}'
     default_language: Igual que el idioma de la interface
     disallowed_hashtags:
       one: 'contenía una etiqueta no permitida: %{tags}'

config/locales/es-MX.yml

@@ -1896,7 +1896,8 @@ es-MX:
         one: "%{count} vídeo"
         other: "%{count} vídeos"
     boosted_from_html: Impulsado desde %{acct_link}
-    content_warning: 'Alerta de contenido: %{warning}'
+    content_warning:
+      warning: 'Alerta de contenido: %{warning}'
     default_language: Igual que el idioma de la interfaz
     disallowed_hashtags:
       one: 'contenía una etiqueta no permitida: %{tags}'

config/locales/es.yml

@@ -1896,7 +1896,8 @@ es:
         one: "%{count} vídeo"
         other: "%{count} vídeos"
     boosted_from_html: Impulsado desde %{acct_link}
-    content_warning: 'Alerta de contenido: %{warning}'
+    content_warning:
+      warning: 'Alerta de contenido: %{warning}'
     default_language: Igual que el idioma de la interfaz
     disallowed_hashtags:
       one: 'contenía una etiqueta no permitida: %{tags}'

config/locales/et.yml

@@ -1896,7 +1896,8 @@ et:
         one: "%{count} video"
         other: "%{count} videot"
     boosted_from_html: "%{acct_link} jagamine"
-    content_warning: 'Sisu hoiatus: %{warning}'
+    content_warning:
+      warning: 'Sisu hoiatus: %{warning}'
     default_language: Kasutajaliidese keelega sama
     disallowed_hashtags:
       one: 'sisaldab ebasobivat silti: %{tags}'

config/locales/eu.yml

@@ -1726,7 +1726,8 @@ eu:
         one: bideo %{count}
         other: "%{count} bideo"
     boosted_from_html: "%{acct_link}(e)tik bultzatua"
-    content_warning: 'Edukiaren abisua: %{warning}'
+    content_warning:
+      warning: 'Edukiaren abisua: %{warning}'
     default_language: Interfazearen hizkuntzaren berdina
     disallowed_hashtags:
       one: 'debekatutako traola bat zuen: %{tags}'

config/locales/fa.yml

@@ -1892,7 +1892,8 @@ fa:
         one: "%{count} ویدیو"
         other: "%{count} ویدیو"
     boosted_from_html: تقویت شده از طرف %{acct_link}
-    content_warning: 'هشدا محتوا: %{warning}'
+    content_warning:
+      warning: 'هشدا محتوا: %{warning}'
     default_language: همانند زبان واسط
     disallowed_hashtags:
       one: 'دارای برچسبی غیرمجاز: %{tags}'

config/locales/fi.yml

@@ -1896,7 +1896,8 @@ fi:
         one: "%{count} video"
         other: "%{count} videota"
     boosted_from_html: Tehosti lähteestä %{acct_link}
-    content_warning: 'Sisältövaroitus: %{warning}'
+    content_warning:
+      warning: 'Sisältövaroitus: %{warning}'
     default_language: Sama kuin käyttöliittymän kieli
     disallowed_hashtags:
       one: 'sisälsi kielletyn aihetunnisteen: %{tags}'

config/locales/fo.yml

@@ -1896,7 +1896,8 @@ fo:
         one: "%{count} sjónfíla"
         other: "%{count} sjónfílur"
     boosted_from_html: Stimbrað frá %{acct_link}
-    content_warning: 'Innihaldsávaring: %{warning}'
+    content_warning:
+      warning: 'Innihaldsávaring: %{warning}'
     default_language: Sama sum markamótsmál
     disallowed_hashtags:
       one: 'innihelt eitt vrakað frámerki: %{tags}'

config/locales/fr-CA.yml

@@ -1837,7 +1837,8 @@ fr-CA:
         one: "%{count} vidéo"
         other: "%{count} vidéos"
     boosted_from_html: Partagé depuis %{acct_link}
-    content_warning: 'Avertissement sur le contenu : %{warning}'
+    content_warning:
+      warning: 'Avertissement sur le contenu : %{warning}'
     default_language: Même langue que celle de l’interface
     disallowed_hashtags:
       one: 'contient un hashtag désactivé : %{tags}'

config/locales/fr.yml

@@ -1837,7 +1837,8 @@ fr:
         one: "%{count} vidéo"
         other: "%{count} vidéos"
     boosted_from_html: Partagé depuis %{acct_link}
-    content_warning: 'Avertissement de contenu : %{warning}'
+    content_warning:
+      warning: 'Avertissement de contenu : %{warning}'
     default_language: Même langue que celle de l’interface
     disallowed_hashtags:
       one: 'contient un hashtag désactivé : %{tags}'

config/locales/fy.yml

@@ -1888,7 +1888,8 @@ fy:
         one: "%{count} fideo"
         other: "%{count} fideo’s"
     boosted_from_html: Boost fan %{acct_link}
-    content_warning: 'Ynhâldswarskôging: %{warning}'
+    content_warning:
+      warning: 'Ynhâldswarskôging: %{warning}'
     default_language: Itselde as de taal fan de brûkersomjouwing
     disallowed_hashtags:
       one: 'befette in net tastiene hashtag: %{tags}'

config/locales/ga.yml

@@ -2019,7 +2019,8 @@ ga:
         other: "%{count} físeáin"
         two: "%{count} físeáin"
     boosted_from_html: Molta ó %{acct_link}
-    content_warning: 'Rabhadh ábhair: %{warning}'
+    content_warning:
+      warning: 'Rabhadh ábhair: %{warning}'
     default_language: Mar an gcéanna le teanga an chomhéadain
     disallowed_hashtags:
       few: 'bhí na Haischlib dícheadaithe: %{tags}'

config/locales/gd.yml

@@ -1943,7 +1943,8 @@ gd:
         other: "%{count} video"
         two: "%{count} video"
     boosted_from_html: Brosnachadh o %{acct_link}
-    content_warning: 'Rabhadh susbainte: %{warning}'
+    content_warning:
+      warning: 'Rabhadh susbainte: %{warning}'
     default_language: Co-ionnan ri cànan na h-eadar-aghaidh
     disallowed_hashtags:
       few: "– bha na tagaichean hais toirmisgte seo ann: %{tags}"

config/locales/gl.yml

@@ -1896,7 +1896,8 @@ gl:
         one: "%{count}  vídeo"
         other: "%{count} vídeos"
     boosted_from_html: Promovida desde %{acct_link}
-    content_warning: 'Aviso sobre o contido: %{warning}'
+    content_warning:
+      warning: 'Aviso sobre o contido: %{warning}'
     default_language: Igual que o idioma da interface
     disallowed_hashtags:
       one: 'contiña un cancelo non permitido: %{tags}'

config/locales/he.yml

@@ -1980,7 +1980,8 @@ he:
         other: "%{count} סרטונים"
         two: "%{count} סרטונים"
     boosted_from_html: הודהד מ-%{acct_link}
-    content_warning: 'אזהרת תוכן: %{warning}'
+    content_warning:
+      warning: 'אזהרת תוכן: %{warning}'
     default_language: זהה לשפת ממשק
     disallowed_hashtags:
       many: 'מכיל את התגיות האסורות: %{tags}'

config/locales/hu.yml

@@ -1896,7 +1896,8 @@ hu:
         one: "%{count} videó"
         other: "%{count} videó"
     boosted_from_html: Megtolva innen %{acct_link}
-    content_warning: 'Tartalmi figyelmeztetés: %{warning}'
+    content_warning:
+      warning: 'Tartalmi figyelmeztetés: %{warning}'
     default_language: Felhasználói felület nyelvével azonos
     disallowed_hashtags:
       one: 'tiltott hashtaget tartalmaz: %{tags}'

config/locales/hy.yml

@@ -771,7 +771,8 @@ hy:
       video:
         one: "%{count} վիդեո"
         other: "%{count} վիդեո"
-    content_warning: Նախազգուշացում։ %{warning}
+    content_warning:
+      warning: Նախազգուշացում։ %{warning}
     edited_at_html: Խմբագրուած՝ %{date}
     over_character_limit: "%{max} նիշի սահմանը գերազանցուած է"
     title: '%{name}: "%{quote}"'

config/locales/ia.yml

@@ -1893,7 +1893,8 @@ ia:
         one: "%{count} video"
         other: "%{count} videos"
     boosted_from_html: Impulsate desde %{acct_link}
-    content_warning: 'Advertimento de contento: %{warning}'
+    content_warning:
+      warning: 'Advertimento de contento: %{warning}'
     default_language: Mesme como lingua de interfacie
     disallowed_hashtags:
       one: 'contineva un hashtag non autorisate: %{tags}'

config/locales/id.yml

@@ -1363,7 +1363,8 @@ id:
       video:
         other: "%{count} video"
     boosted_from_html: Boost dari %{acct_link}
-    content_warning: 'Peringatan konten: %{warning}'
+    content_warning:
+      warning: 'Peringatan konten: %{warning}'
     default_language: Sama seperti bahasa antarmuka
     disallowed_hashtags:
       other: 'berisi tagar yang tidak diizinkan: %{tags}'

config/locales/ie.yml

@@ -1605,7 +1605,8 @@ ie:
         one: "%{count} video"
         other: "%{count} videos"
     boosted_from_html: Boostat de %{acct_link}
-    content_warning: 'Avise de contenete: %{warning}'
+    content_warning:
+      warning: 'Avise de contenete: %{warning}'
     default_language: Sam quam li lingue del interfacie
     disallowed_hashtags:
       one: 'contenet un ínpermisset hashtag: %{tags}'

config/locales/io.yml

@@ -1726,7 +1726,8 @@ io:
         one: "%{count} video"
         other: "%{count} videi"
     boosted_from_html: Repetis de %{acct_link}
-    content_warning: 'Kontenajaverto: %{warning}'
+    content_warning:
+      warning: 'Kontenajaverto: %{warning}'
     default_language: Sama quale intervizajlinguo
     disallowed_hashtags:
       one: 'kontenas nepermisita hashtago: %{tags}'

config/locales/is.yml

@@ -1900,7 +1900,8 @@ is:
         one: "%{count} myndskeið"
         other: "%{count} myndskeið"
     boosted_from_html: Endurbirt frá %{acct_link}
-    content_warning: 'Aðvörun vegna efnis (CW): %{warning}'
+    content_warning:
+      warning: 'Aðvörun vegna efnis (CW): %{warning}'
     default_language: Sama og tungumál viðmóts
     disallowed_hashtags:
       one: 'innihélt óleyfilegt myllumerki: %{tags}'

config/locales/it.yml

@@ -1898,7 +1898,8 @@ it:
         one: "%{count} video"
         other: "%{count} video"
     boosted_from_html: Condiviso da %{acct_link}
-    content_warning: 'Avviso di contenuto: %{warning}'
+    content_warning:
+      warning: 'Avviso di contenuto: %{warning}'
     default_language: Come la lingua dell'interfaccia
     disallowed_hashtags:
       one: 'contiene un hashtag non permesso: %{tags}'

config/locales/ja.yml

@@ -1810,7 +1810,8 @@ ja:
       video:
         other: "%{count}本の動画"
     boosted_from_html: "%{acct_link}からブースト"
-    content_warning: '閲覧注意: %{warning}'
+    content_warning:
+      warning: '閲覧注意: %{warning}'
     default_language: UIの表示言語
     disallowed_hashtags:
       other: '許可されていないハッシュタグが含まれています: %{tags}'

config/locales/ka.yml

@@ -422,7 +422,8 @@ ka:
         one: "%{count} ვიდეო"
         other: "%{count} ვიდეოები"
     boosted_from_html: გაიზარდა %{acct_link}-იდან
-    content_warning: 'გაფრთხილება კონტენტზე: %{warning}'
+    content_warning:
+      warning: 'გაფრთხილება კონტენტზე: %{warning}'
     disallowed_hashtags:
       one: 'მოიცავდა აკრძალულ ჰეშტეგს: %{tags}'
       other: 'მოიცავს აკრძალულ ჰეშტეგს: %{tags}'

config/locales/kk.yml

@@ -638,7 +638,8 @@ kk:
         one: "%{count} видео"
         other: "%{count} видео"
     boosted_from_html: Бөлісілді %{acct_link}
-    content_warning: 'Контент ескертуі: %{warning}'
+    content_warning:
+      warning: 'Контент ескертуі: %{warning}'
     disallowed_hashtags:
       one: 'рұқсат етілмеген хэштег: %{tags}'
       other: 'рұқсат етілмеген хэштегтер: %{tags}'

config/locales/ko.yml

@@ -1853,7 +1853,8 @@ ko:
       video:
         other: "%{count} 개의 영상"
     boosted_from_html: "%{acct_link}의 글을 부스트"
-    content_warning: '열람 주의: %{warning}'
+    content_warning:
+      warning: '열람 주의: %{warning}'
     default_language: 화면 표시 언어와 동일하게
     disallowed_hashtags:
       other: '허용되지 않은 해시태그를 포함하고 있습니다: %{tags}'

config/locales/ku.yml

@@ -1388,7 +1388,8 @@ ku:
         one: "%{count} vîdyo"
         other: "%{count} vîdyo"
     boosted_from_html: Bilindkirî ji alî %{acct_link} ve
-    content_warning: 'Hişyariya naverokê: %{warning}'
+    content_warning:
+      warning: 'Hişyariya naverokê: %{warning}'
     default_language: Wekî zimanê navrûya bikarhêneriyê
     disallowed_hashtags:
       one: 'hashtagek bê maf tê de hebû: %{tags}'

config/locales/lad.yml

@@ -1731,7 +1731,8 @@ lad:
         one: "%{count} video"
         other: "%{count} videos"
     boosted_from_html: Repartajado dizde %{acct_link}
-    content_warning: 'Avertensya de kontenido: %{warning}'
+    content_warning:
+      warning: 'Avertensya de kontenido: %{warning}'
     default_language: La mezma ke la lingua de la enterfaz
     disallowed_hashtags:
       one: 'kontenia una etiketa no permetida: %{tags}'

config/locales/lt.yml

@@ -1207,7 +1207,8 @@ lt:
         one: "%{count} vaizdas"
         other: "%{count} vaizdų"
     boosted_from_html: Pakelta iš %{acct_link}
-    content_warning: 'Turinio įspėjimas: %{warning}'
+    content_warning:
+      warning: 'Turinio įspėjimas: %{warning}'
     errors:
       quoted_status_not_found: Įrašas, kurį bandote cituoti, atrodo, neegzistuoja.
     over_character_limit: pasiektas %{max} simbolių limitas

config/locales/lv.yml

@@ -1888,7 +1888,8 @@ lv:
         other: "%{count} video"
         zero: "%{count} video"
     boosted_from_html: Izcēla %{acct_link}
-    content_warning: 'Satura brīdinājums: %{warning}'
+    content_warning:
+      warning: 'Satura brīdinājums: %{warning}'
     default_language: Tāda, kā saskarnes valoda
     disallowed_hashtags:
       one: 'saturēja neatļautu tēmturi: %{tags}'

config/locales/ms.yml

@@ -1538,7 +1538,8 @@ ms:
       video:
         other: "%{count} video"
     boosted_from_html: Dirangsang daripada %{acct_link}
-    content_warning: 'Amaran kandungan: %{warning}'
+    content_warning:
+      warning: 'Amaran kandungan: %{warning}'
     default_language: Sama dengan bahasa antara muka
     disallowed_hashtags:
       other: 'mengandungi hashtag yang tidak dibenarkan: %{tags}'

config/locales/my.yml

@@ -1529,7 +1529,8 @@ my:
       video:
         other: "%{count} ဗီဒီယို"
     boosted_from_html: "%{acct_link} မှ Boost လုပ်ခဲ့သည်"
-    content_warning: အကြောင်းအရာသတိပေးချက် - %{warning}
+    content_warning:
+      warning: အကြောင်းအရာသတိပေးချက် - %{warning}
     default_language: လက်ရှိသုံးနေသောဘာသာစကားအတိုင်း ပြပေးပါမည်
     disallowed_hashtags:
       other: ခွင့်မပြုထားသော hashtags များပါရှိသည် - %{tags}

config/locales/nl.yml

@@ -1896,7 +1896,8 @@ nl:
         one: "%{count} video"
         other: "%{count} video's"
     boosted_from_html: Geboost van %{acct_link}
-    content_warning: 'Inhoudswaarschuwing: %{warning}'
+    content_warning:
+      warning: 'Inhoudswaarschuwing: %{warning}'
     default_language: Hetzelfde als de taal van de gebruikersomgeving
     disallowed_hashtags:
       one: 'bevatte een niet toegestane hashtag: %{tags}'

config/locales/nn.yml

@@ -1893,7 +1893,8 @@ nn:
         one: "%{count} video"
         other: "%{count} videoar"
     boosted_from_html: Framheva av %{acct_link}
-    content_warning: 'Innhaldsåtvaring: %{warning}'
+    content_warning:
+      warning: 'Innhaldsåtvaring: %{warning}'
     default_language: Samme språk som brukergrensesnittet
     disallowed_hashtags:
       one: 'inneheldt ein emneknagg som ikkje var tillaten: %{tags}'

config/locales/no.yml

@@ -1612,7 +1612,8 @@
         one: "%{count} video"
         other: "%{count} videoer"
     boosted_from_html: Boostet fra %{acct_link}
-    content_warning: 'Innholdsvarsel: %{warning}'
+    content_warning:
+      warning: 'Innholdsvarsel: %{warning}'
     default_language: Samme språk som brukergrensesnittet
     disallowed_hashtags:
       one: 'inneholdt en ikke tillatt hashtag: %{tags}'

config/locales/oc.yml

@@ -832,7 +832,8 @@ oc:
         one: "%{count} vidèo"
         other: "%{count} vidèos"
     boosted_from_html: Partejat de %{acct_link}
-    content_warning: 'Avertiment de contengut : %{warning}'
+    content_warning:
+      warning: 'Avertiment de contengut : %{warning}'
     default_language: Parièr que la lenga d’interfàcia
     disallowed_hashtags:
       one: 'conten una etiqueta desactivada : %{tags}'

config/locales/pl.yml

@@ -1954,7 +1954,8 @@ pl:
         one: "%{count} film"
         other: "%{count} filmów"
     boosted_from_html: Podbito przez %{acct_link}
-    content_warning: 'Ostrzeżenie o zawartości: %{warning}'
+    content_warning:
+      warning: 'Ostrzeżenie o zawartości: %{warning}'
     default_language: Taki sam jak język interfejsu użytkownika
     disallowed_hashtags:
       few: 'zawiera niedozwolone hashtagi: %{tags}'

config/locales/pt-BR.yml

@@ -1896,7 +1896,8 @@ pt-BR:
         one: "%{count} vídeo"
         other: "%{count} vídeos"
     boosted_from_html: Impulso de %{acct_link}
-    content_warning: 'Aviso de conteúdo: %{warning}'
+    content_warning:
+      warning: 'Aviso de conteúdo: %{warning}'
     default_language: Igual ao idioma da interface
     disallowed_hashtags:
       one: 'continha hashtag não permitida: %{tags}'

config/locales/pt-PT.yml

@@ -1893,7 +1893,8 @@ pt-PT:
         one: "%{count} vídeo"
         other: "%{count} vídeos"
     boosted_from_html: Impulsionado por %{acct_link}
-    content_warning: 'Aviso de conteúdo: %{warning}'
+    content_warning:
+      warning: 'Aviso de conteúdo: %{warning}'
     default_language: Igual ao idioma da interface
     disallowed_hashtags:
       one: 'continha uma #etiqueta proibida: %{tags}'

config/locales/ro.yml

@@ -672,7 +672,8 @@ ro:
         one: "%{count} imagine"
         other: "%{count} de imagini"
     boosted_from_html: Impuls de la %{acct_link}
-    content_warning: 'Avertisment privind conținutul: %{warning}'
+    content_warning:
+      warning: 'Avertisment privind conținutul: %{warning}'
     disallowed_hashtags:
       few: 'conținea aceste hashtag-uri nepermise: %{tags}'
       one: 'conținea un hashtag nepermis: %{tags}'

config/locales/ru.yml

@@ -1957,7 +1957,8 @@ ru:
         one: "%{count} видео"
         other: "%{count} видео"
     boosted_from_html: Продвижение польз. %{acct_link}
-    content_warning: 'Предупреждение о содержании: %{warning}'
+    content_warning:
+      warning: 'Предупреждение о содержании: %{warning}'
     default_language: Тот же, что язык интерфейса
     disallowed_hashtags:
       few: 'содержались запрещённые хэштеги: %{tags}'

config/locales/sc.yml

@@ -1142,7 +1142,8 @@ sc:
         one: "%{count} vìdeu"
         other: "%{count} vìdeos"
     boosted_from_html: Cumpartzidu dae %{acct_link}
-    content_warning: 'Avisu de cuntenutu: %{warning}'
+    content_warning:
+      warning: 'Avisu de cuntenutu: %{warning}'
     disallowed_hashtags:
       one: 'cuntenet un''eticheta non permìtida: %{tags}'
       other: 'cuntenet is etichetas non permìtidas: %{tags}'

config/locales/sco.yml

@@ -1378,7 +1378,8 @@ sco:
         one: "%{count} video"
         other: "%{count} videos"
     boosted_from_html: Heezed fae %{acct_link}
-    content_warning: 'Content warnin: %{warning}'
+    content_warning:
+      warning: 'Content warnin: %{warning}'
     default_language: Same as interface leid
     disallowed_hashtags:
       one: 'containt a disallooed hashtag: %{tags}'

config/locales/si.yml

@@ -1252,7 +1252,8 @@ si:
       video:
         one: දෘශ්‍යක %{count}
         other: දෘශ්‍යක %{count}
-    content_warning: 'අන්තර්ගත අනතුරු ඇඟවීම: %{warning}'
+    content_warning:
+      warning: 'අන්තර්ගත අනතුරු ඇඟවීම: %{warning}'
     default_language: අතුරු මුහුණතේ භාෂාවම
     disallowed_hashtags:
       one: 'අනුමත නොකළ හැෂ් ටැගයක් අඩංගු විය: %{tags}'

config/locales/sk.yml

@@ -1260,7 +1260,8 @@ sk:
         one: "%{count} obrázok"
         other: "%{count} obrázky"
     boosted_from_html: Vyzdvihnuté od %{acct_link}
-    content_warning: 'Varovanie o obsahu: %{warning}'
+    content_warning:
+      warning: 'Varovanie o obsahu: %{warning}'
     default_language: Rovnaký ako jazyk rozhrania
     disallowed_hashtags:
       few: 'obsah nepovolených haštagov: %{tags}'

config/locales/sl.yml

@@ -1893,7 +1893,8 @@ sl:
         other: "%{count} video posnetkov"
         two: "%{count} video posnetka"
     boosted_from_html: Izpostavljeno z računa %{acct_link}
-    content_warning: 'Opozorilo o vsebini: %{warning}'
+    content_warning:
+      warning: 'Opozorilo o vsebini: %{warning}'
     default_language: Enak kot jezik vmesnika
     disallowed_hashtags:
       few: 'vsebuje nedovoljene ključnike: %{tags}'

config/locales/sq.yml

@@ -1849,7 +1849,8 @@ sq:
         one: "%{count} video"
         other: "%{count} video"
     boosted_from_html: Përforcuar nga %{acct_link}
-    content_warning: 'Sinjalizim lënde: %{warning}'
+    content_warning:
+      warning: 'Sinjalizim lënde: %{warning}'
     default_language: Njësoj me gjuhën e ndërfaqes
     disallowed_hashtags:
       one: 'përmbante një hashtag të palejuar: %{tags}'

config/locales/sr-Latn.yml

@@ -1637,7 +1637,8 @@ sr-Latn:
         one: "%{count} video zapis"
         other: "%{count} video zapisa"
     boosted_from_html: Podržano od %{acct_link}
-    content_warning: 'Upozorenje na sadržaj: %{warning}'
+    content_warning:
+      warning: 'Upozorenje na sadržaj: %{warning}'
     default_language: Isto kao jezik okruženja
     disallowed_hashtags:
       few: 'sadrži zabranjene heš oznake: %{tags}'

config/locales/sr.yml

@@ -1667,7 +1667,8 @@ sr:
         one: "%{count} видео запис"
         other: "%{count} видео записа"
     boosted_from_html: Подржано од %{acct_link}
-    content_warning: 'Упозорење на садржај: %{warning}'
+    content_warning:
+      warning: 'Упозорење на садржај: %{warning}'
     default_language: Исто као језик окружења
     disallowed_hashtags:
       few: 'садржи забрањене хеш ознаке: %{tags}'

config/locales/sv.yml

@@ -1893,7 +1893,8 @@ sv:
         one: "%{count} video"
         other: "%{count} videor"
     boosted_from_html: Boostad från %{acct_link}
-    content_warning: 'Innehållsvarning: %{warning}'
+    content_warning:
+      warning: 'Innehållsvarning: %{warning}'
     default_language: Samma som användargränssnittet
     disallowed_hashtags:
       one: 'innehöll en otillåten hashtag: %{tags}'

config/locales/th.yml

@@ -1767,7 +1767,8 @@ th:
       video:
         other: "%{count} วิดีโอ"
     boosted_from_html: ดันจาก %{acct_link}
-    content_warning: 'คำเตือนเนื้อหา: %{warning}'
+    content_warning:
+      warning: 'คำเตือนเนื้อหา: %{warning}'
     default_language: เหมือนกับภาษาส่วนติดต่อ
     disallowed_hashtags:
       other: 'มีแฮชแท็กที่ไม่อนุญาต: %{tags}'

config/locales/tr.yml

@@ -1893,7 +1893,8 @@ tr:
         one: "%{count} video"
         other: "%{count} videolar"
     boosted_from_html: "%{acct_link} kişisinden yeniden paylaştı"
-    content_warning: 'İçerik uyarısı: %{warning}'
+    content_warning:
+      warning: 'İçerik uyarısı: %{warning}'
     default_language: Arayüz diliyle aynı
     disallowed_hashtags:
       one: 'izin verilmeyen bir etiket içeriyordu: %{tags}'

config/locales/uk.yml

@@ -1854,7 +1854,8 @@ uk:
         one: "%{count} відео"
         other: "%{count} відео"
     boosted_from_html: Просунуто від %{acct_link}
-    content_warning: 'Попередження про контент: %{warning}'
+    content_warning:
+      warning: 'Попередження про контент: %{warning}'
     default_language: Така ж як і мова інтерфейсу
     disallowed_hashtags:
       few: 'заборонених хештеґа: %{tags}'

config/locales/vi.yml

@@ -1854,7 +1854,8 @@ vi:
       video:
         other: "%{count} video"
     boosted_from_html: Đã đăng lại từ %{acct_link}
-    content_warning: 'Cảnh báo nội dung: %{warning}'
+    content_warning:
+      warning: 'Cảnh báo nội dung: %{warning}'
     default_language: Giống giao diện
     disallowed_hashtags:
       other: 'chứa các hashtag bị cấm: %{tags}'

config/locales/zh-CN.yml

@@ -1854,7 +1854,8 @@ zh-CN:
       video:
         other: "%{count} 段视频"
     boosted_from_html: 转嘟自 %{acct_link}
-    content_warning: 内容警告：%{warning}
+    content_warning:
+      warning: 内容警告：%{warning}
     default_language: 与界面显示语言相同
     disallowed_hashtags:
       other: 包含以下被禁止的话题：%{tags}

config/locales/zh-HK.yml

@@ -1617,7 +1617,8 @@ zh-HK:
       video:
         other: "%{count} 段影片"
     boosted_from_html: 轉推自 %{acct_link}
-    content_warning: 內容警告： %{warning}
+    content_warning:
+      warning: 內容警告： %{warning}
     default_language: 與介面語言相同
     disallowed_hashtags:
       other: 包含不允許的標籤： %{tags}

config/locales/zh-TW.yml

@@ -1856,7 +1856,8 @@ zh-TW:
       video:
         other: "%{count} 段影片"
     boosted_from_html: 轉嘟自 %{acct_link}
-    content_warning: 內容警告： %{warning}
+    content_warning:
+      warning: 內容警告： %{warning}
     default_language: 與介面語言相同
     disallowed_hashtags:
       other: 含有不得使用的標籤： %{tags}

spec/helpers/statuses_helper_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe StatusesHelper do
 
       it 'returns the content warning' do
         result = helper.status_text_summary(status)
-        expect(result).to eq(I18n.t('statuses.content_warning', warning: 'SPOILERS!!!'))
+        expect(result).to eq(I18n.t('statuses.content_warning.warning', warning: 'SPOILERS!!!'))
       end
     end
   end

yarn.lock

@@ -11957,8 +11957,8 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.91.0
+  version: 1.92.0
-  resolution: "sass@npm:1.91.0"
+  resolution: "sass@npm:1.92.0"
   dependencies:
     "@parcel/watcher": "npm:^2.4.1"
     chokidar: "npm:^4.0.0"
@@ -11969,7 +11969,7 @@ __metadata:
       optional: true
   bin:
     sass: sass.js
-  checksum: 10c0/5be1c98f7a618cb5f90b62f63d2aa0f78f9bf369c93ec7cd9880752a26b0ead19aa63cc341e8a26ce6c74d080baa5705f1685dff52fe6a3f28a7828ae50182b6
+  checksum: 10c0/bdff9fa6988620e2a81962efdd016e3894d19934cfadc105cf41db767f59dd47afd8ff32840e612ef700cb67e19d9e83c108f1724eb8f0bef56c4877dbe6f14d
   languageName: node
   linkType: hard