Fix errors when rendering RSS feeds (#18531)

diff --git a/app/helpers/formatting_helper.rb b/app/helpers/formatting_helper.rb
index 526efd766f74cf0361258b96b45a1ac79bfebf0a..448177bec255a2630ef3228f807f25114832a9ed 100644 (file)
--- 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

diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb
index d39bb6c930d8208689c2002a8e0c0c31a60788f5..4077e19bdf0052842e3ceedeb2be8b5b5b72a233 100644 (file)
--- a/app/helpers/languages_helper.rb
+++ b/app/helpers/languages_helper.rb
@@ -254,4 +254,8 @@ module LanguagesHelper
   def valid_locale?(locale)
     locale.present? && SUPPORTED_LOCALES.key?(locale.to_sym)
   end
+
+  def available_locale_or_nil(locale_name)
+    locale_name.to_sym if locale_name.present? && I18n.available_locales.include?(locale_name.to_sym)
+  end
 end

diff --git a/app/lib/rss/media_content.rb b/app/lib/rss/media_content.rb
index 7aefd8b40b9c5b4fbe556f11eab23dfbe926074e..f281fe29e4027c9af9f1fadb0d4af9b801cf58bb 100644 (file)
--- a/app/lib/rss/media_content.rb
+++ b/app/lib/rss/media_content.rb
@@ -26,4 +26,10 @@ class RSS::MediaContent < RSS::Element
       description['type'] = 'plain'
     end
   end
+
+  def thumbnail(str)
+    append_element('media:thumbnail') do |thumbnail|
+      thumbnail['url'] = str
+    end
+  end
 end