From 3c45dfa0fe89a62a0320cf0e2d45bf86263f6cb5 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 20 Aug 2021 16:11:58 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20=E2=80=9Cdiscoverable=E2=80=9D=20account?=
=?UTF-8?q?=20setting=20being=20tied=20to=20profile=20directory=20(#16637)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/settings/profiles/show.html.haml | 5 ++---
config/locales/simple_form.en.yml | 3 ++-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml
index 4885878f0..d325a9ea5 100644
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@@ -29,9 +29,8 @@
.fields-group
= f.input :bot, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.bot')
- - if Setting.profile_directory
- .fields-group
- = f.input :discoverable, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.discoverable'), recommended: true
+ .fields-group
+ = f.input :discoverable, as: :boolean, wrapper: :with_label, hint: t(Setting.profile_directory ? 'simple_form.hints.defaults.discoverable' : 'simple_form.hints.defaults.discoverable_no_directory'), recommended: true
%hr.spacer/
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 113aef2d3..bf864748c 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -35,7 +35,8 @@ en:
current_password: For security purposes please enter the password of the current account
current_username: To confirm, please enter the username of the current account
digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence
- discoverable: Allow your account to be discovered by strangers through recommendations and other features
+ discoverable: Allow your account to be discovered by strangers through recommendations, profile directory and other features
+ discoverable_no_directory: Allow your account to be discovered by strangers through recommendations and other features
email: You will be sent a confirmation e-mail
fields: You can have up to 4 items displayed as a table on your profile
header: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px