Merge branch 'main' into glitch-soc/merge-upstream

2022-05-26 23:30:10 +02:00
parent 6d13901e4c fbcbf7898f
commit 3f10136a41
5 changed files with 59 additions and 2 deletions
--- a/app/helpers/formatting_helper.rb
+++ b/app/helpers/formatting_helper.rb
@@ -23,7 +23,7 @@ module FormattingHelper

    before_html = begin
      if status.spoiler_text?
-        "<p><strong>#{I18n.t('rss.content_warning', locale: valid_locale_or_nil(status.language))}</strong> #{h(status.spoiler_text)}</p><hr />"
+        "<p><strong>#{I18n.t('rss.content_warning', locale: available_locale_or_nil(status.language) || I18n.default_locale)}</strong> #{h(status.spoiler_text)}</p><hr />"
      else
        ''
      end