From 452f15be78a3577b137ec516c6a7acfbccd8da47 Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 22 Aug 2023 19:02:02 +0200 Subject: [PATCH] =?UTF-8?q?Move=20glitch-soc's=20=E2=80=9CHide=20followers?= =?UTF-8?q?=20count=E2=80=9D=20setting=20to=20=E2=80=9CShow=20followers=20?= =?UTF-8?q?count=E2=80=9D=20under=20=E2=80=9CPrivacy=20and=20reach?= =?UTF-8?q?=E2=80=9D=20tab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/user_settings.rb | 1 + app/views/settings/preferences/other/show.html.haml | 4 ---- app/views/settings/privacy/show.html.haml | 4 ++++ config/locales-glitch/simple_form.en.yml | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/models/user_settings.rb b/app/models/user_settings.rb index 3c8616ec5a..7a64159d84 100644 --- a/app/models/user_settings.rb +++ b/app/models/user_settings.rb @@ -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 diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml index 511d65a66f..afe8529e00 100644 --- a/app/views/settings/preferences/other/show.html.haml +++ b/app/views/settings/preferences/other/show.html.haml @@ -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 diff --git a/app/views/settings/privacy/show.html.haml b/app/views/settings/privacy/show.html.haml index ce31e60f06..6b7ae14e94 100644 --- a/app/views/settings/privacy/show.html.haml +++ b/app/views/settings/privacy/show.html.haml @@ -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 diff --git a/config/locales-glitch/simple_form.en.yml b/config/locales-glitch/simple_form.en.yml index 2507894a8c..9e943133bd 100644 --- a/config/locales-glitch/simple_form.en.yml +++ b/config/locales-glitch/simple_form.en.yml @@ -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: