diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-08-20 16:30:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-20 16:30:21 +0200 |
| commit | 70909c5b094523b0cf77123a2566310b2f148e24 (patch) | |
| tree | bf6a4a1dcdb49267a77ae3c62381796474c062cf | |
| parent | 65b003cab86b6837012f4562d3d9d0910f3e942e (diff) | |
| parent | 1aca5ef9bcfb7cd58aa7635bcb58d24dd28afedf (diff) | |
Merge pull request #1589 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
| -rw-r--r-- | app/views/settings/profiles/show.html.haml | 5 | ||||
| -rw-r--r-- | 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 6061e9cfd..21948b200 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 |