Skip to content

Commit

Permalink
Fix missing description on enable bootstrap timeline accounts toggle …
Browse files Browse the repository at this point in the history
…in admin UI (#15367)
  • Loading branch information
Gargron committed Dec 18, 2020
1 parent a60d933 commit 59343ef
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
3 changes: 2 additions & 1 deletion app/views/admin/settings/edit.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 59343ef

Please sign in to comment.