diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2022-05-26 23:02:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-26 23:02:42 +0200 |
| commit | 0a1992430db7a859b3b7faa3d9ce4f07734b5fd8 (patch) | |
| tree | 7db13796c63ef4e9cec4653ec9cf6a0a10aeef21 | |
| parent | 52f4e834f293c9fdbf5805639d022ac4e3856b75 (diff) | |
Fix errors when rendering RSS feeds (#18531)
| -rw-r--r-- | app/helpers/formatting_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/languages_helper.rb | 4 | ||||
| -rw-r--r-- | app/lib/rss/media_content.rb | 6 |
3 files changed, 11 insertions, 1 deletions
diff --git a/app/helpers/formatting_helper.rb b/app/helpers/formatting_helper.rb index f5b8dbed87d..a9d2f965125 100644 --- 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 d39bb6c930d..4077e19bdf0 100644 --- 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 7aefd8b40b9..f281fe29e40 100644 --- 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 |