diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 26 | ||||
| -rw-r--r-- | config/routes.rb | 7 | ||||
| -rw-r--r-- | config/settings.yml | 2 |
3 files changed, 32 insertions, 3 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 71cb35381..dd92e2d19 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -461,6 +461,13 @@ en: enable_keybase: desc_html: Allow your users to prove their identity via keybase title: Enable keybase integration + domain_blocks: + all: To everyone + disabled: To no one + title: Show domain blocks + users: To logged-in local users + domain_blocks_rationale: + title: Show rationale hero: desc_html: Displayed on the frontpage. At least 600x100px recommended. When not set, falls back to server thumbnail title: Hero image @@ -680,6 +687,25 @@ en: people: one: "%{count} monster" other: "%{count} monsters" + domain_blocks: + blocked_domains: List of limited and blocked domains + description: This is the list of servers that %{instance} limits or reject federation with. + domain: Domain + media_block: Media block + no_domain_blocks: "(No domain blocks)" + severity: Severity + severity_legend: + media_block: Media files coming from the server are neither fetched, stored, or displayed to the user. + silence: Accounts from silenced servers can be found, followed and interacted with, but their toots will not appear in the public timelines, and notifications from them will not reach local users who are not following them. + suspension: No content from suspended servers is stored or displayed, nor is any content sent to them. Interactions from suspended servers are ignored. + suspension_disclaimer: Suspended servers may occasionally retrieve public content from this server. + title: Severities + show_rationale: Show rationale + silence: Silence + suspension: Suspension + title: "%{instance} List of blocked instances" + domain_validator: + invalid_domain: is not a valid domain name errors: '400': The request you submitted was invalid or malformed. '403': You don't have permission to view this page. diff --git a/config/routes.rb b/config/routes.rb index e05f1ed2b..9891965ec 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -425,9 +425,10 @@ Rails.application.routes.draw do get '/web/(*any)', to: 'home#index', as: :web - get '/about', to: 'about#show' - get '/about/more', to: 'about#more' - get '/terms', to: 'about#terms' + get '/about', to: 'about#show' + get '/about/more', to: 'about#more' + get '/about/blocks', to: 'about#blocks' + get '/terms', to: 'about#terms' get '/policies', to: 'domain_policy#show' diff --git a/config/settings.yml b/config/settings.yml index 04d8bbaea..4f4ac0db8 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -77,6 +77,8 @@ defaults: &defaults mark_known_from_mentions: true mark_known_from_boosts: true mark_known_from_favourites: false + show_domain_blocks: 'disabled' + show_domain_blocks_rationale: 'disabled' development: <<: *defaults |