mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-25 19:03:43 +01:00
Move glitch-soc's “Hide followers count” setting to “Show followers count” under “Privacy and reach” tab
This commit is contained in:
parent
c053bfc45a
commit
452f15be78
4 changed files with 7 additions and 6 deletions
|
@ -20,6 +20,7 @@ class UserSettings
|
|||
setting :hide_followers_count, default: false
|
||||
|
||||
setting_inverse_alias :indexable, :noindex
|
||||
setting_inverse_alias :show_followers_count, :hide_followers_count
|
||||
|
||||
namespace :web do
|
||||
setting :advanced_layout, default: false
|
||||
|
|
|
@ -11,10 +11,6 @@
|
|||
.fields-group
|
||||
= ff.input :aggregate_reblogs, wrapper: :with_label, recommended: true, label: I18n.t('simple_form.labels.defaults.setting_aggregate_reblogs'), hint: I18n.t('simple_form.hints.defaults.setting_aggregate_reblogs')
|
||||
|
||||
- unless Setting.hide_followers_count
|
||||
.fields-group
|
||||
= ff.input :hide_followers_count, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_hide_followers_count'), glitch_only: true
|
||||
|
||||
%h4= t 'preferences.posting_defaults'
|
||||
|
||||
.fields-row
|
||||
|
|
|
@ -36,6 +36,10 @@
|
|||
= f.input :show_collections, as: :boolean, wrapper: :with_label
|
||||
|
||||
= f.simple_fields_for :settings, current_user.settings do |ff|
|
||||
- unless Setting.hide_followers_count
|
||||
.fields-group
|
||||
= ff.input :show_followers_count, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_show_followers_count'), hint: I18n.t('simple_form.hints.defaults.setting_show_followers_count'), glitch_only: true
|
||||
|
||||
.fields-group
|
||||
= ff.input :show_application, wrapper: :with_label
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ en:
|
|||
setting_default_content_type_markdown: When writing toots, assume they are using Markdown for rich text formatting, unless specified otherwise
|
||||
setting_default_content_type_plain: When writing toots, assume they are plain text with no special formatting, unless specified otherwise (default Mastodon behavior)
|
||||
setting_default_language: The language of your toots can be detected automatically, but it's not always accurate
|
||||
setting_hide_followers_count: Hide your followers count from everybody, including you. Some applications may display a negative followers count.
|
||||
setting_show_followers_count: Show your followers count on your profile. If you hide your followers count, it will be hidden even from yourself, and some applications may display a negative followers count.
|
||||
setting_skin: Reskins the selected Mastodon flavour
|
||||
labels:
|
||||
defaults:
|
||||
|
@ -17,7 +17,7 @@ en:
|
|||
setting_default_content_type_markdown: Markdown
|
||||
setting_default_content_type_plain: Plain text
|
||||
setting_favourite_modal: Show confirmation dialog before favouriting (applies to Glitch flavour only)
|
||||
setting_hide_followers_count: Hide your followers count
|
||||
setting_show_followers_count: Show your followers count
|
||||
setting_skin: Skin
|
||||
setting_system_emoji_font: Use system's default font for emojis (applies to Glitch flavour only)
|
||||
notification_emails:
|
||||
|
|
Loading…
Reference in a new issue