From 4cac1b78faf9f6710e2fb8b781039cfeda51739c Mon Sep 17 00:00:00 2001 From: Emelia Smith Date: Thu, 28 Aug 2025 01:11:54 +0200 Subject: [PATCH 1/2] Improve display of content warnings in Admin UI with pure css --- app/javascript/styles/mastodon/admin.scss | 47 +++++++++++++++++-- .../admin/shared/_status_content.html.haml | 10 +++- config/locales/en.yml | 5 +- 3 files changed, 56 insertions(+), 6 deletions(-) diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index 2f3b96411d8..8b2f711381a 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/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 { - display: list-item; + > details { + 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'); + } + } } } } diff --git a/app/views/admin/shared/_status_content.html.haml b/app/views/admin/shared/_status_content.html.haml index aedd84bdd67..aff2281ceb7 100644 --- a/app/views/admin/shared/_status_content.html.haml +++ b/app/views/admin/shared/_status_content.html.haml @@ -1,8 +1,14 @@ .status__content>< - if status.spoiler_text.present? %details< - %summary>< - %strong> Content warning: #{prerender_custom_emojis(h(status.spoiler_text), status.emojis)} + %summary{ + 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 diff --git a/config/locales/en.yml b/config/locales/en.yml index ebbb72fb073..5c74c0b1200 100644 --- a/config/locales/en.yml +++ b/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}' From e86721a4e02043e26e0e8d95ef22d693df7eb8cf Mon Sep 17 00:00:00 2001 From: Emelia Smith Date: Tue, 2 Sep 2025 23:06:00 +0200 Subject: [PATCH 2/2] Fix localisation issues --- app/helpers/statuses_helper.rb | 2 +- config/locales/af.yml | 3 ++- config/locales/an.yml | 3 ++- config/locales/ar.yml | 3 ++- config/locales/be.yml | 3 ++- config/locales/bg.yml | 3 ++- config/locales/ca.yml | 3 ++- config/locales/ckb.yml | 3 ++- config/locales/co.yml | 3 ++- config/locales/cs.yml | 3 ++- config/locales/cy.yml | 3 ++- config/locales/da.yml | 3 ++- config/locales/de.yml | 3 ++- config/locales/el.yml | 3 ++- config/locales/en-GB.yml | 3 ++- config/locales/eo.yml | 3 ++- config/locales/es-AR.yml | 3 ++- config/locales/es-MX.yml | 3 ++- config/locales/es.yml | 3 ++- config/locales/et.yml | 3 ++- config/locales/eu.yml | 3 ++- config/locales/fa.yml | 3 ++- config/locales/fi.yml | 3 ++- config/locales/fo.yml | 3 ++- config/locales/fr-CA.yml | 3 ++- config/locales/fr.yml | 3 ++- config/locales/fy.yml | 3 ++- config/locales/ga.yml | 3 ++- config/locales/gd.yml | 3 ++- config/locales/gl.yml | 3 ++- config/locales/he.yml | 3 ++- config/locales/hu.yml | 3 ++- config/locales/hy.yml | 3 ++- config/locales/ia.yml | 3 ++- config/locales/id.yml | 3 ++- config/locales/ie.yml | 3 ++- config/locales/io.yml | 3 ++- config/locales/is.yml | 3 ++- config/locales/it.yml | 3 ++- config/locales/ja.yml | 3 ++- config/locales/ka.yml | 3 ++- config/locales/kk.yml | 3 ++- config/locales/ko.yml | 3 ++- config/locales/ku.yml | 3 ++- config/locales/lad.yml | 3 ++- config/locales/lt.yml | 3 ++- config/locales/lv.yml | 3 ++- config/locales/ms.yml | 3 ++- config/locales/my.yml | 3 ++- config/locales/nl.yml | 3 ++- config/locales/nn.yml | 3 ++- config/locales/no.yml | 3 ++- config/locales/oc.yml | 3 ++- config/locales/pl.yml | 3 ++- config/locales/pt-BR.yml | 3 ++- config/locales/pt-PT.yml | 3 ++- config/locales/ro.yml | 3 ++- config/locales/ru.yml | 3 ++- config/locales/sc.yml | 3 ++- config/locales/sco.yml | 3 ++- config/locales/si.yml | 3 ++- config/locales/sk.yml | 3 ++- config/locales/sl.yml | 3 ++- config/locales/sq.yml | 3 ++- config/locales/sr-Latn.yml | 3 ++- config/locales/sr.yml | 3 ++- config/locales/sv.yml | 3 ++- config/locales/th.yml | 3 ++- config/locales/tr.yml | 3 ++- config/locales/uk.yml | 3 ++- config/locales/vi.yml | 3 ++- config/locales/zh-CN.yml | 3 ++- config/locales/zh-HK.yml | 3 ++- config/locales/zh-TW.yml | 3 ++- spec/helpers/statuses_helper_spec.rb | 2 +- 75 files changed, 148 insertions(+), 75 deletions(-) diff --git a/app/helpers/statuses_helper.rb b/app/helpers/statuses_helper.rb index 16b9d3fb531..c839e6b7f78 100644 --- a/app/helpers/statuses_helper.rb +++ b/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) diff --git a/config/locales/af.yml b/config/locales/af.yml index 89ede096e28..77841ea843b 100644 --- a/config/locales/af.yml +++ b/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: diff --git a/config/locales/an.yml b/config/locales/an.yml index 168cb1904b0..37aab90335d 100644 --- a/config/locales/an.yml +++ b/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}' diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 19a10803d7f..c8490e29e17 100644 --- a/config/locales/ar.yml +++ b/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}' diff --git a/config/locales/be.yml b/config/locales/be.yml index 2f2577a756e..f49258e2a9d 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -1977,7 +1977,8 @@ be: one: "%{count} відэафайл" other: "%{count} відэафайла" boosted_from_html: Пашырыў уліковы запіс %{acct_link} - content_warning: 'Папярэджанне аб змесціве: %{warning}' + content_warning: + warning: 'Папярэджанне аб змесціве: %{warning}' default_language: Такая, што і мова інтэрфэйсу disallowed_hashtags: few: 'змяшчае недазволеныя хэштэгі: %{tags}' diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 8bb97bb22d8..8c7a98785d4 100644 --- a/config/locales/bg.yml +++ b/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}' diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 34f9074db14..2d37fed9a5e 100644 --- a/config/locales/ca.yml +++ b/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}' diff --git a/config/locales/ckb.yml b/config/locales/ckb.yml index 597dc5c3e8d..cc9d60120f6 100644 --- a/config/locales/ckb.yml +++ b/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}' diff --git a/config/locales/co.yml b/config/locales/co.yml index 29217c0b658..2d3681419fa 100644 --- a/config/locales/co.yml +++ b/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}' diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 78cfc4f31d2..cc167284082 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -1977,7 +1977,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}' diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 3d590069afc..b6df89cdf20 100644 --- a/config/locales/cy.yml +++ b/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}' diff --git a/config/locales/da.yml b/config/locales/da.yml index 44241b1e1e5..1cde1770d3e 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -1893,7 +1893,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}' diff --git a/config/locales/de.yml b/config/locales/de.yml index a215667685b..36adbd438fd 100644 --- a/config/locales/de.yml +++ b/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}' diff --git a/config/locales/el.yml b/config/locales/el.yml index 000f5fbff2e..094bbe09700 100644 --- a/config/locales/el.yml +++ b/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}' diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index e2cf9701d75..de7df36705d 100644 --- a/config/locales/en-GB.yml +++ b/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}' diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 7daabc19284..46e55395b82 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -1844,7 +1844,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}' diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml index a565764ffc0..96e5150af89 100644 --- a/config/locales/es-AR.yml +++ b/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}' diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml index 56d974485fd..d7039cd0fac 100644 --- a/config/locales/es-MX.yml +++ b/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}' diff --git a/config/locales/es.yml b/config/locales/es.yml index 93b8bb8817e..e7059c564ff 100644 --- a/config/locales/es.yml +++ b/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}' diff --git a/config/locales/et.yml b/config/locales/et.yml index 77008362cca..adf2c4bed61 100644 --- a/config/locales/et.yml +++ b/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}' diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 92e504aa285..0a9f2604504 100644 --- a/config/locales/eu.yml +++ b/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}' diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 1fcdfaaee48..bd54c9a8ef9 100644 --- a/config/locales/fa.yml +++ b/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}' diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 8adf44fa0c2..2a8a9a3c4e8 100644 --- a/config/locales/fi.yml +++ b/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}' diff --git a/config/locales/fo.yml b/config/locales/fo.yml index 018e6ce80df..19009ecfa37 100644 --- a/config/locales/fo.yml +++ b/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}' diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml index efc728307dd..cea7a436c9f 100644 --- a/config/locales/fr-CA.yml +++ b/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}' diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 07627b39a72..b5e46504aed 100644 --- a/config/locales/fr.yml +++ b/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}' diff --git a/config/locales/fy.yml b/config/locales/fy.yml index b00b81d9fb5..f2594a302a1 100644 --- a/config/locales/fy.yml +++ b/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}' diff --git a/config/locales/ga.yml b/config/locales/ga.yml index 04ccd623ad9..6bccbe99090 100644 --- a/config/locales/ga.yml +++ b/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}' diff --git a/config/locales/gd.yml b/config/locales/gd.yml index edb49ee87a0..f59071f7510 100644 --- a/config/locales/gd.yml +++ b/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}" diff --git a/config/locales/gl.yml b/config/locales/gl.yml index d7c947e4938..e4415aa1bdc 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -1893,7 +1893,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}' diff --git a/config/locales/he.yml b/config/locales/he.yml index b720bd7f119..427d6141ed9 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -1979,7 +1979,8 @@ he: other: "%{count} סרטונים" two: "%{count} סרטונים" boosted_from_html: הודהד מ-%{acct_link} - content_warning: 'אזהרת תוכן: %{warning}' + content_warning: + warning: 'אזהרת תוכן: %{warning}' default_language: זהה לשפת ממשק disallowed_hashtags: many: 'מכיל את התגיות האסורות: %{tags}' diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 4967be453f5..65b32c726e9 100644 --- a/config/locales/hu.yml +++ b/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}' diff --git a/config/locales/hy.yml b/config/locales/hy.yml index 69edde570f0..24afb8cfb47 100644 --- a/config/locales/hy.yml +++ b/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}"' diff --git a/config/locales/ia.yml b/config/locales/ia.yml index 681cbd4cc15..61e3f067037 100644 --- a/config/locales/ia.yml +++ b/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}' diff --git a/config/locales/id.yml b/config/locales/id.yml index b0ee0190982..45f72df6a88 100644 --- a/config/locales/id.yml +++ b/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}' diff --git a/config/locales/ie.yml b/config/locales/ie.yml index 2c767daa37e..8fa15d1b0c1 100644 --- a/config/locales/ie.yml +++ b/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}' diff --git a/config/locales/io.yml b/config/locales/io.yml index c1f6825fbeb..55eb2880951 100644 --- a/config/locales/io.yml +++ b/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}' diff --git a/config/locales/is.yml b/config/locales/is.yml index 7504628ad34..33133ecee51 100644 --- a/config/locales/is.yml +++ b/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}' diff --git a/config/locales/it.yml b/config/locales/it.yml index 4000ee4b12d..fea6d52b83f 100644 --- a/config/locales/it.yml +++ b/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}' diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 09169210b65..dad0851c20a 100644 --- a/config/locales/ja.yml +++ b/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}' diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 039a7a0b102..61ae6dda59e 100644 --- a/config/locales/ka.yml +++ b/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}' diff --git a/config/locales/kk.yml b/config/locales/kk.yml index 4b32abdf5b7..3f63ea53815 100644 --- a/config/locales/kk.yml +++ b/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}' diff --git a/config/locales/ko.yml b/config/locales/ko.yml index e4f1493c351..833fd9ab246 100644 --- a/config/locales/ko.yml +++ b/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}' diff --git a/config/locales/ku.yml b/config/locales/ku.yml index 9bc02ea2f0e..294ee8d9a16 100644 --- a/config/locales/ku.yml +++ b/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}' diff --git a/config/locales/lad.yml b/config/locales/lad.yml index 2791843f989..4efe4559f32 100644 --- a/config/locales/lad.yml +++ b/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}' diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 92791bd795d..b0bba8efdfb 100644 --- a/config/locales/lt.yml +++ b/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 diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 7c296022f55..15927fbd0c9 100644 --- a/config/locales/lv.yml +++ b/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}' diff --git a/config/locales/ms.yml b/config/locales/ms.yml index d9c057e503a..9aa26547016 100644 --- a/config/locales/ms.yml +++ b/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}' diff --git a/config/locales/my.yml b/config/locales/my.yml index 6e03b196c38..a0f2408ae5c 100644 --- a/config/locales/my.yml +++ b/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} diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 9fb17e305ef..d2da2b1aa72 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -1893,7 +1893,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}' diff --git a/config/locales/nn.yml b/config/locales/nn.yml index ca347958dcd..a20b71dd82f 100644 --- a/config/locales/nn.yml +++ b/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}' diff --git a/config/locales/no.yml b/config/locales/no.yml index 7cbf08b48e4..130211598ac 100644 --- a/config/locales/no.yml +++ b/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}' diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 82888e38ffe..286bad6be03 100644 --- a/config/locales/oc.yml +++ b/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}' diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 6945ce57c01..51786d51175 100644 --- a/config/locales/pl.yml +++ b/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}' diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 0d6bf76b3f3..19a898cd681 100644 --- a/config/locales/pt-BR.yml +++ b/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}' diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index 3d9c4e2535b..f465c541691 100644 --- a/config/locales/pt-PT.yml +++ b/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}' diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 17d10f7924b..117842fcc26 100644 --- a/config/locales/ro.yml +++ b/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}' diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 895eb869d96..6d4d826ff5e 100644 --- a/config/locales/ru.yml +++ b/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}' diff --git a/config/locales/sc.yml b/config/locales/sc.yml index 444b26eb80b..9b972262e72 100644 --- a/config/locales/sc.yml +++ b/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}' diff --git a/config/locales/sco.yml b/config/locales/sco.yml index c20b14dab39..8c1515bdc23 100644 --- a/config/locales/sco.yml +++ b/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}' diff --git a/config/locales/si.yml b/config/locales/si.yml index 8e7fffc75ca..e51b6e1450d 100644 --- a/config/locales/si.yml +++ b/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}' diff --git a/config/locales/sk.yml b/config/locales/sk.yml index a9e409aad5d..4d5231e04d7 100644 --- a/config/locales/sk.yml +++ b/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}' diff --git a/config/locales/sl.yml b/config/locales/sl.yml index f8b1949d6b0..ce5a96b91fc 100644 --- a/config/locales/sl.yml +++ b/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}' diff --git a/config/locales/sq.yml b/config/locales/sq.yml index c94161f5357..a396dcdce8c 100644 --- a/config/locales/sq.yml +++ b/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}' diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index 31a379aa84d..e64a0d870bf 100644 --- a/config/locales/sr-Latn.yml +++ b/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}' diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 6c6c5b740ea..6780b514b54 100644 --- a/config/locales/sr.yml +++ b/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}' diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 50c2cb22d50..c581267495c 100644 --- a/config/locales/sv.yml +++ b/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}' diff --git a/config/locales/th.yml b/config/locales/th.yml index 9ce35ef0ecb..8542fb9343e 100644 --- a/config/locales/th.yml +++ b/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}' diff --git a/config/locales/tr.yml b/config/locales/tr.yml index b7da232de38..f07c62e9fd7 100644 --- a/config/locales/tr.yml +++ b/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}' diff --git a/config/locales/uk.yml b/config/locales/uk.yml index f1937dd4d23..6194e3306b7 100644 --- a/config/locales/uk.yml +++ b/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}' diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 69e934c3034..7c564150f8e 100644 --- a/config/locales/vi.yml +++ b/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}' diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 2f1747b96df..a9ac62b307d 100644 --- a/config/locales/zh-CN.yml +++ b/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} diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml index 5de477a4081..bcc793b5cb5 100644 --- a/config/locales/zh-HK.yml +++ b/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} diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 6921e227c40..d67d19bd8b6 100644 --- a/config/locales/zh-TW.yml +++ b/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} diff --git a/spec/helpers/statuses_helper_spec.rb b/spec/helpers/statuses_helper_spec.rb index 07ad72eda95..da875bf3544 100644 --- a/spec/helpers/statuses_helper_spec.rb +++ b/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