Revert "Change "Allow trends without prior review" setting to include statuses (#17977)"

This reverts commit 546672e292.
This commit is contained in:
Claire 2022-10-02 18:11:46 +02:00
parent 4500504ec2
commit bfc539cfb4
8 changed files with 7 additions and 23 deletions

View file

@ -202,8 +202,7 @@
}
.account-role,
.simple_form .recommended,
.simple_form .not_recommended {
.simple_form .recommended {
display: inline-block;
padding: 4px 6px;
cursor: default;
@ -228,12 +227,6 @@
}
}
.simple_form .not_recommended {
color: lighten($error-red, 12%);
background-color: rgba(lighten($error-red, 12%), 0.1);
border-color: rgba(lighten($error-red, 12%), 0.5);
}
.account__header__fields {
max-width: 100vw;
padding: 0;

View file

@ -102,8 +102,7 @@ code {
}
}
.recommended,
.not_recommended {
.recommended {
position: absolute;
margin: 0 4px;
margin-top: -2px;

View file

@ -262,10 +262,6 @@ class Account < ApplicationRecord
update!(memorial: true)
end
def trendable
boolean_with_default('trendable', Setting.trendable_by_default)
end
def sign?
true
end

View file

@ -81,7 +81,7 @@
= f.input :trends, as: :boolean, wrapper: :with_label, label: t('admin.settings.trends.title'), hint: t('admin.settings.trends.desc_html')
.fields-group
= f.input :trendable_by_default, as: :boolean, wrapper: :with_label, label: t('admin.settings.trendable_by_default.title'), hint: t('admin.settings.trendable_by_default.desc_html'), recommended: :not_recommended
= f.input :trendable_by_default, as: :boolean, wrapper: :with_label, label: t('admin.settings.trendable_by_default.title'), hint: t('admin.settings.trendable_by_default.desc_html')
.fields-group
= f.input :trending_status_cw, as: :boolean, wrapper: :with_label, label: t('admin.settings.trending_status_cw.title'), hint: t('admin.settings.trending_status_cw.desc_html')

View file

@ -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.*'

View file

@ -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

View file

@ -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

View file

@ -261,7 +261,6 @@ en:
events: Enabled events
url: Endpoint URL
'no': 'No'
not_recommended: Not recommended
recommended: Recommended
required:
mark: "*"