Revert "Change "Allow trends without prior review" setting to include statuses (#17977)"
This reverts commit 546672e292
.
This commit is contained in:
@ -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.*'
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -261,7 +261,6 @@ en:
|
||||
events: Enabled events
|
||||
url: Endpoint URL
|
||||
'no': 'No'
|
||||
not_recommended: Not recommended
|
||||
recommended: Recommended
|
||||
required:
|
||||
mark: "*"
|
||||
|
Reference in New Issue
Block a user