From 0a1992430db7a859b3b7faa3d9ce4f07734b5fd8 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 26 May 2022 23:02:42 +0200
Subject: Fix errors when rendering RSS feeds (#18531)

---
 app/helpers/formatting_helper.rb | 2 +-
 app/helpers/languages_helper.rb  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'app/helpers')

diff --git a/app/helpers/formatting_helper.rb b/app/helpers/formatting_helper.rb
index f5b8dbed8..a9d2f9651 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 d39bb6c93..4077e19bd 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
-- 
cgit