Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
ac3c83ef
Unverified
Commit
ac3c83ef
authored
4 years ago
by
Mélanie Chauvel
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Improve wording and add titles on moderated servers section in /about/more (#13930)
parent
d890abfc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/views/about/more.html.haml
+3
-0
3 additions, 0 deletions
app/views/about/more.html.haml
config/locales/en.yml
+5
-2
5 additions, 2 deletions
config/locales/en.yml
with
8 additions
and
2 deletions
app/views/about/more.html.haml
+
3
−
0
View file @
ac3c83ef
...
...
@@ -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
}
...
...
This diff is collapsed.
Click to expand it.
config/locales/en.yml
+
5
−
2
View file @
ac3c83ef
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment