From bfc539cfb4f040fcffac740b36791c26c2a74119 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sun, 2 Oct 2022 18:11:46 +0200
Subject: Revert "Change "Allow trends without prior review" setting to include
 statuses (#17977)"

This reverts commit 546672e292dc3218e996048464c4c52e5d00f766.
---
 config/i18n-tasks.yml              | 2 +-
 config/initializers/simple_form.rb | 5 +----
 config/locales/en.yml              | 4 ++--
 config/locales/simple_form.en.yml  | 1 -
 4 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'config')

diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index cc607f72a..7139bcea7 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -51,7 +51,7 @@ ignore_unused:
   - 'activerecord.errors.*'
   - '{devise,pagination,doorkeeper}.*'
   - '{date,datetime,time,number}.*'
-  - 'simple_form.{yes,no,recommended,not_recommended}'
+  - 'simple_form.{yes,no,recommended}'
   - 'simple_form.{placeholders,hints,labels}.*'
   - 'simple_form.{error_notification,required}.:'
   - 'errors.messages.*'
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
index 92cffc5a2..3a2097d2f 100644
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
@@ -11,10 +11,7 @@ end
 module RecommendedComponent
   def recommended(_wrapper_options = nil)
     return unless options[:recommended]
-
-    key = options[:recommended].is_a?(Symbol) ? options[:recommended] : :recommended
-    options[:label_text] = ->(raw_label_text, _required_label_text, _label_present) { safe_join([raw_label_text, ' ', content_tag(:span, I18n.t(key, scope: 'simple_form'), class: key)]) }
-
+    options[:label_text] = ->(raw_label_text, _required_label_text, _label_present) { safe_join([raw_label_text, ' ', content_tag(:span, I18n.t('simple_form.recommended'), class: 'recommended')]) }
     nil
   end
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index dd341e0c8..6f0f3e953 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -807,8 +807,8 @@ en:
         title: Allow unauthenticated access to public timeline
       title: Site settings
       trendable_by_default:
-        desc_html: Specific trending content can still be explicitly disallowed
-        title: Allow trends without prior review
+        desc_html: Affects hashtags that have not been previously disallowed
+        title: Allow hashtags to trend without prior review
       trends:
         desc_html: Publicly display previously reviewed content that is currently trending
         title: Trends
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index db5b45e41..ec4c445e8 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -261,7 +261,6 @@ en:
         events: Enabled events
         url: Endpoint URL
     'no': 'No'
-    not_recommended: Not recommended
     recommended: Recommended
     required:
       mark: "*"
-- 
cgit