diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-10-09 00:30:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-09 00:30:15 +0200 |
| commit | c8bcf5cbfdc4b076eae0d9091e688436aa7f2508 (patch) | |
| tree | 8e928bd8fef79212f6d6e5a4fb79bf0509359a9a /config | |
| parent | 19cdc627658166664fb1571ec45564d237e63757 (diff) | |
Add admin setting to auto-approve hashtags (#12122)
Change inaccurate labels on other admin settings
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 11 | ||||
| -rw-r--r-- | config/settings.yml | 1 |
2 files changed, 8 insertions, 4 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 68fc21323..0e8ee6a76 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -478,8 +478,8 @@ en: open: Anyone can sign up title: Registrations mode show_known_fediverse_at_about_page: - desc_html: When toggled, it will show toots from all the known fediverse on preview. Otherwise it will only show local toots. - title: Show known fediverse on timeline preview + desc_html: When disabled, restricts the public timeline linked from the landing page to showing only local content + title: Include federated content on unauthenticated public timeline page show_staff_badge: desc_html: Show a staff badge on a user page title: Show staff badge @@ -503,9 +503,12 @@ en: desc_html: Used for previews via OpenGraph and API. 1200x630px recommended title: Server thumbnail timeline_preview: - desc_html: Display public timeline on landing page - title: Timeline preview + desc_html: Display link to public timeline on landing page and allow API access to the public timeline without authentication + title: Allow unauthenticated access to public timeline title: Site settings + trendable_by_default: + desc_html: Affects hashtags that have not been previously disallowed + title: Allow hashtags to trend without prior review trends: desc_html: Publicly display previously reviewed hashtags that are currently trending title: Trending hashtags diff --git a/config/settings.yml b/config/settings.yml index 6dbc46706..bd2f65b5e 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -35,6 +35,7 @@ defaults: &defaults use_blurhash: true use_pending_items: false trends: true + trendable_by_default: false notification_emails: follow: false reblog: false |