diff options
| author | Mélanie Chauvel <perso@hack-libre.org> | 2020-06-09 10:28:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-09 10:28:02 +0200 |
| commit | ac3c83ef6fe207a22d67ff8912e74c21c6b61daf (patch) | |
| tree | f68d490ea7501c811b7ce115acf9339e54a81bd7 | |
| parent | d890abfcab076f5df4eafb75397435d32c641e20 (diff) | |
Improve wording and add titles on moderated servers section in /about/more (#13930)
| -rw-r--r-- | app/views/about/more.html.haml | 3 | ||||
| -rw-r--r-- | config/locales/en.yml | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml index 7e156db61..4152a3601 100644 --- a/app/views/about/more.html.haml +++ b/app/views/about/more.html.haml @@ -56,12 +56,15 @@ %p= t('about.unavailable_content_html') - if (blocks = @blocks.select(&:reject_media?)) && !blocks.empty? + %h3= t('about.unavailable_content_description.rejecting_media_title') %p= t('about.unavailable_content_description.rejecting_media') = render partial: 'domain_blocks', locals: { domain_blocks: blocks } - if (blocks = @blocks.select(&:silence?)) && !blocks.empty? + %h3= t('about.unavailable_content_description.silenced_title') %p= t('about.unavailable_content_description.silenced') = render partial: 'domain_blocks', locals: { domain_blocks: blocks } - if (blocks = @blocks.select(&:suspend?)) && !blocks.empty? + %h3= t('about.unavailable_content_description.suspended_title') %p= t('about.unavailable_content_description.suspended') = render partial: 'domain_blocks', locals: { domain_blocks: blocks } diff --git a/config/locales/en.yml b/config/locales/en.yml index a33605049..aed96e3e1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -35,13 +35,16 @@ en: status_count_before: Who authored tagline: Follow friends and discover new ones terms: Terms of service - unavailable_content: Unavailable content + unavailable_content: Moderated servers unavailable_content_description: domain: Server reason: Reason rejecting_media: 'Media files from these servers will not be processed or stored, and no thumbnails will be displayed, requiring manual click-through to the original file:' - silenced: 'Posts from these servers will be hidden in public timelines and conversations, and no notifications will be generated from their users'' interactions, unless you are following them:' + rejecting_media_title: Filtered media + silenced: 'Posts from these servers will be hidden in public timelines and conversations, and no notifications will be generated from their users interactions, unless you are following them:' + silenced_title: Silenced servers suspended: 'No data from these servers will be processed, stored or exchanged, making any interaction or communication with users from these servers impossible:' + suspended_title: Suspended servers unavailable_content_html: Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server. user_count_after: one: user |