From 59343ef4d19b104deb2751399846823675772df3 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 19 Dec 2020 00:19:15 +0100
Subject: [PATCH] Fix missing description on enable bootstrap timeline accounts
toggle in admin UI (#15367)
---
app/views/admin/settings/edit.html.haml | 3 ++-
config/locales/en.yml | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml
index a162490b5..159bd4b0a 100644
--- a/app/views/admin/settings/edit.html.haml
+++ b/app/views/admin/settings/edit.html.haml
@@ -50,7 +50,8 @@
%hr.spacer/
.fields-group
- = f.input :enable_bootstrap_timeline_accounts, as: :boolean, wrapper: :with_label, label: t('admin.settings.enable_bootstrap_timeline_accounts.title')
+ = f.input :enable_bootstrap_timeline_accounts, as: :boolean, wrapper: :with_label, label: t('admin.settings.enable_bootstrap_timeline_accounts.title'), hint: t('admin.settings.enable_bootstrap_timeline_accounts.desc_html')
+
.fields-group
= f.input :bootstrap_timeline_accounts, wrapper: :with_block_label, label: t('admin.settings.bootstrap_timeline_accounts.title'), hint: t('admin.settings.bootstrap_timeline_accounts.desc_html'), disabled: !Setting.enable_bootstrap_timeline_accounts
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7ea4ea154..8245397d7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -566,6 +566,7 @@ en:
domain_blocks_rationale:
title: Show rationale
enable_bootstrap_timeline_accounts:
+ desc_html: Make new users automatically follow configured accounts so their home feed doesn't start out empty
title: Enable default follows for new users
hero:
desc_html: Displayed on the frontpage. At least 600x100px recommended. When not set, falls back to server thumbnail