Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
pleroma-fe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
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
Pleroma
pleroma-fe
Commits
4aeba026
Commit
4aeba026
authored
5 years ago
by
Hakaba Hitoyo
Committed by
Shpuld Shpludson
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Refactor i18n messages for MRF policy disclosure
parent
f50068ef
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1074
Update master with 2.0.0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/components/mrf_transparency_panel/mrf_transparency_panel.vue
+16
-16
16 additions, 16 deletions
...ponents/mrf_transparency_panel/mrf_transparency_panel.vue
src/i18n/en.json
+20
-18
20 additions, 18 deletions
src/i18n/en.json
src/i18n/ja_easy.json
+21
-17
21 additions, 17 deletions
src/i18n/ja_easy.json
with
57 additions
and
51 deletions
src/components/mrf_transparency_panel/mrf_transparency_panel.vue
+
16
−
16
View file @
4aeba026
...
@@ -6,13 +6,13 @@
...
@@ -6,13 +6,13 @@
<div
class=
"panel panel-default base01-background"
>
<div
class=
"panel panel-default base01-background"
>
<div
class=
"panel-heading timeline-heading base02-background"
>
<div
class=
"panel-heading timeline-heading base02-background"
>
<div
class=
"title"
>
<div
class=
"title"
>
{{
$t
(
"
about.federation
"
)
}}
{{
$t
(
"
about.
mrf.
federation
"
)
}}
</div>
</div>
</div>
</div>
<div
class=
"panel-body"
>
<div
class=
"panel-body"
>
<div
class=
"mrf-section"
>
<div
class=
"mrf-section"
>
<h2>
{{
$t
(
"
about.mrf_policies
"
)
}}
</h2>
<h2>
{{
$t
(
"
about.mrf
.mrf
_policies
"
)
}}
</h2>
<p>
{{
$t
(
"
about.mrf_policies_desc
"
)
}}
</p>
<p>
{{
$t
(
"
about.mrf
.mrf
_policies_desc
"
)
}}
</p>
<ul>
<ul>
<li
<li
...
@@ -23,13 +23,13 @@
...
@@ -23,13 +23,13 @@
</ul>
</ul>
<h2
v-if=
"hasInstanceSpecificPolicies"
>
<h2
v-if=
"hasInstanceSpecificPolicies"
>
{{
$t
(
"
about.mrf
_policy_simple
"
)
}}
{{
$t
(
"
about.mrf
.simple.simple_policies
"
)
}}
</h2>
</h2>
<div
v-if=
"acceptInstances.length"
>
<div
v-if=
"acceptInstances.length"
>
<h4>
{{
$t
(
"
about.mrf
_policy_
simple
_
accept
"
)
}}
</h4>
<h4>
{{
$t
(
"
about.mrf
.
simple
.
accept
"
)
}}
</h4>
<p>
{{
$t
(
"
about.mrf
_policy_
simple
_
accept_desc
"
)
}}
</p>
<p>
{{
$t
(
"
about.mrf
.
simple
.
accept_desc
"
)
}}
</p>
<ul>
<ul>
<li
<li
...
@@ -41,9 +41,9 @@
...
@@ -41,9 +41,9 @@
</div>
</div>
<div
v-if=
"rejectInstances.length"
>
<div
v-if=
"rejectInstances.length"
>
<h4>
{{
$t
(
"
about.mrf
_policy_
simple
_
reject
"
)
}}
</h4>
<h4>
{{
$t
(
"
about.mrf
.
simple
.
reject
"
)
}}
</h4>
<p>
{{
$t
(
"
about.mrf
_policy_
simple
_
reject_desc
"
)
}}
</p>
<p>
{{
$t
(
"
about.mrf
.
simple
.
reject_desc
"
)
}}
</p>
<ul>
<ul>
<li
<li
...
@@ -55,9 +55,9 @@
...
@@ -55,9 +55,9 @@
</div>
</div>
<div
v-if=
"quarantineInstances.length"
>
<div
v-if=
"quarantineInstances.length"
>
<h4>
{{
$t
(
"
about.mrf
_policy_
simple
_
quarantine
"
)
}}
</h4>
<h4>
{{
$t
(
"
about.mrf
.
simple
.
quarantine
"
)
}}
</h4>
<p>
{{
$t
(
"
about.mrf
_policy_
simple
_
quarantine_desc
"
)
}}
</p>
<p>
{{
$t
(
"
about.mrf
.
simple
.
quarantine_desc
"
)
}}
</p>
<ul>
<ul>
<li
<li
...
@@ -69,9 +69,9 @@
...
@@ -69,9 +69,9 @@
</div>
</div>
<div
v-if=
"ftlRemovalInstances.length"
>
<div
v-if=
"ftlRemovalInstances.length"
>
<h4>
{{
$t
(
"
about.mrf
_policy_
simple
_
ftl_removal
"
)
}}
</h4>
<h4>
{{
$t
(
"
about.mrf
.
simple
.
ftl_removal
"
)
}}
</h4>
<p>
{{
$t
(
"
about.mrf
_policy_
simple
_
ftl_removal_desc
"
)
}}
</p>
<p>
{{
$t
(
"
about.mrf
.
simple
.
ftl_removal_desc
"
)
}}
</p>
<ul>
<ul>
<li
<li
...
@@ -83,9 +83,9 @@
...
@@ -83,9 +83,9 @@
</div>
</div>
<div
v-if=
"mediaNsfwInstances.length"
>
<div
v-if=
"mediaNsfwInstances.length"
>
<h4>
{{
$t
(
"
about.mrf
_policy_
simple
_
media_nsfw
"
)
}}
</h4>
<h4>
{{
$t
(
"
about.mrf
.
simple
.
media_nsfw
"
)
}}
</h4>
<p>
{{
$t
(
"
about.mrf
_policy_
simple
_
media_nsfw_desc
"
)
}}
</p>
<p>
{{
$t
(
"
about.mrf
.
simple
.
media_nsfw_desc
"
)
}}
</p>
<ul>
<ul>
<li
<li
...
@@ -97,9 +97,9 @@
...
@@ -97,9 +97,9 @@
</div>
</div>
<div
v-if=
"mediaRemovalInstances.length"
>
<div
v-if=
"mediaRemovalInstances.length"
>
<h4>
{{
$t
(
"
about.mrf
_policy_
simple
_
media_removal
"
)
}}
</h4>
<h4>
{{
$t
(
"
about.mrf
.
simple
.
media_removal
"
)
}}
</h4>
<p>
{{
$t
(
"
about.mrf
_policy_
simple
_
media_removal_desc
"
)
}}
</p>
<p>
{{
$t
(
"
about.mrf
.
simple
.
media_removal_desc
"
)
}}
</p>
<ul>
<ul>
<li
<li
...
...
This diff is collapsed.
Click to expand it.
src/i18n/en.json
+
20
−
18
View file @
4aeba026
{
{
"about"
:
{
"about"
:
{
"staff"
:
"Staff"
,
"federation"
:
"Federation"
,
"mrf_policies"
:
"Enabled MRF Policies"
,
"mrf_policies_desc"
:
"MRF policies manipulate the federation behaviour of the instance. The following policies are enabled:"
,
"mrf_policy_simple"
:
"Instance-specific Policies"
,
"mrf_policy_simple_accept"
:
"Accept"
,
"mrf_policy_simple_accept_desc"
:
"This instance only accepts messages from the following instances:"
,
"mrf_policy_simple_reject"
:
"Reject"
,
"mrf_policy_simple_reject_desc"
:
"This instance will not accept messages from the following instances:"
,
"mrf_policy_simple_quarantine"
:
"Quarantine"
,
"mrf_policy_simple_quarantine_desc"
:
"This instance will send only public posts to the following instances:"
,
"mrf_policy_simple_ftl_removal"
:
"Removal from
\"
The Whole Known Network
\"
Timeline"
,
"mrf_policy_simple_ftl_removal_desc"
:
"This instance removes these instances from
\"
The Whole Known Network
\"
timeline:"
,
"mrf_policy_simple_media_removal"
:
"Media Removal"
,
"mrf_policy_simple_media_removal_desc"
:
"This instance removes media from posts on the following instances:"
,
"mrf_policy_simple_media_nsfw"
:
"Media Force-set As Sensitive"
,
"mrf_policy_simple_media_nsfw_desc"
:
"This instance forces media to be set sensitive in posts on the following instances:"
,
"mrf"
:
{
"mrf"
:
{
"federation"
:
"Federation"
,
"keyword"
:
{
"keyword"
:
{
"keyword_policies"
:
"Keyword Policies"
,
"keyword_policies"
:
"Keyword Policies"
,
"ftl_removal"
:
"Removal from
\"
The Whole Known Network
\"
Timeline"
,
"ftl_removal"
:
"Removal from
\"
The Whole Known Network
\"
Timeline"
,
"reject"
:
"Reject"
,
"reject"
:
"Reject"
,
"replace"
:
"Replace"
,
"replace"
:
"Replace"
,
"is_replaced_by"
:
"→"
"is_replaced_by"
:
"→"
},
"mrf_policies"
:
"Enabled MRF Policies"
,
"mrf_policies_desc"
:
"MRF policies manipulate the federation behaviour of the instance. The following policies are enabled:"
,
"simple"
:
{
"simple_policies"
:
"Instance-specific Policies"
,
"accept"
:
"Accept"
,
"accept_desc"
:
"This instance only accepts messages from the following instances:"
,
"reject"
:
"Reject"
,
"reject_desc"
:
"This instance will not accept messages from the following instances:"
,
"quarantine"
:
"Quarantine"
,
"quarantine_desc"
:
"This instance will send only public posts to the following instances:"
,
"ftl_removal"
:
"Removal from
\"
The Whole Known Network
\"
Timeline"
,
"ftl_removal_desc"
:
"This instance removes these instances from
\"
The Whole Known Network
\"
timeline:"
,
"media_removal"
:
"Media Removal"
,
"media_removal_desc"
:
"This instance removes media from posts on the following instances:"
,
"media_nsfw"
:
"Media Force-set As Sensitive"
,
"media_nsfw_desc"
:
"This instance forces media to be set sensitive in posts on the following instances:"
}
}
}
},
"staff"
:
"Staff"
},
},
"chat"
:
{
"chat"
:
{
"title"
:
"Chat"
"title"
:
"Chat"
...
...
This diff is collapsed.
Click to expand it.
src/i18n/ja_easy.json
+
21
−
17
View file @
4aeba026
{
{
"about"
:
{
"about"
:
{
"staff"
:
"スタッフ"
,
"mrf"
:
{
"federation"
:
"フェデレーション"
,
"federation"
:
"フェデレーション"
,
"mrf_policies"
:
"ゆうこうなMRFポリシー"
,
"mrf_policies"
:
"ゆうこうなMRFポリシー"
,
"mrf_policies_desc"
:
"MRFポリシーは、このインスタンスのフェデレーションのふるまいを、いじります。これらのMRFポリシーがゆうこうになっています:"
,
"mrf_policies_desc"
:
"MRFポリシーは、このインスタンスのフェデレーションのふるまいを、いじります。これらのMRFポリシーがゆうこうになっています:"
,
"mrf_policy_simple"
:
"インスタンスのポリシー"
,
"simple"
:
{
"mrf_policy_simple_accept"
:
"うけいれ"
,
"simple_policies"
:
"インスタンスのポリシー"
,
"mrf_policy_simple_accept_desc"
:
"このインスンスは、これらのインスタンスからのメッセージのみをうけいれます:"
,
"accept"
:
"うけいれ"
,
"mrf_policy_simple_reject"
:
"おことわり"
,
"accept_desc"
:
"このインスンスは、これらのインスタンスからのメッセージのみをうけいれます:"
,
"mrf_policy_simple_reject_desc"
:
"このインスタンスは、これらのインスタンスからのメッセージをうけいれません:"
,
"reject"
:
"おことわり"
,
"mrf_policy_simple_quarantine"
:
"けんえき"
,
"reject_desc"
:
"このインスタンスは、これらのインスタンスからのメッセージをうけいれません:"
,
"mrf_policy_simple_quarantine_desc"
:
"このインスタンスは、これらのインスタンスに、パブリックなとうこうのみを、おくります:"
,
"quarantine"
:
"けんえき"
,
"mrf_policy_simple_ftl_removal"
:
"「つながっているすべてのネットワーク」タイムラインからのぞく"
,
"quarantine_desc"
:
"このインスタンスは、これらのインスタンスに、パブリックなとうこうのみを、おくります:"
,
"mrf_policy_simple_ftl_removal_desc"
:
"このインスタンスは、つながっているすべてのネットワーク」タイムラインから、これらのインスタンスを、とりのぞきます:"
,
"ftl_removal"
:
"「つながっているすべてのネットワーク」タイムラインからのぞく"
,
"mrf_policy_simple_media_removal"
:
"メディアをのぞく"
,
"ftl_removal_desc"
:
"このインスタンスは、つながっているすべてのネットワーク」タイムラインから、これらのインスタンスを、とりのぞきます:"
,
"mrf_policy_simple_media_removal_desc"
:
"このインスタンスは、これらのインスタンスからおくられてきたメディアを、とりのぞきます:"
,
"media_removal"
:
"メディアをのぞく"
,
"mrf_policy_simple_media_nsfw"
:
"メディアをすべてセンシティブにする"
,
"media_removal_desc"
:
"このインスタンスは、これらのインスタンスからおくられてきたメディアを、とりのぞきます:"
,
"mrf_policy_simple_media_nsfw_desc"
:
"このインスタンスは、これらのインスタンスからおくられてきたメディアを、すべて、センシティブにマークします:"
"media_nsfw"
:
"メディアをすべてセンシティブにする"
,
"media_nsfw_desc"
:
"このインスタンスは、これらのインスタンスからおくられてきたメディアを、すべて、センシティブにマークします:"
}
},
"staff"
:
"スタッフ"
},
},
"chat"
:
{
"chat"
:
{
"title"
:
"チャット"
"title"
:
"チャット"
...
...
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