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
c3b27ab4
Commit
c3b27ab4
authored
6 years ago
by
HJ
Browse files
Options
Downloads
Patches
Plain Diff
moved replies filtering to "filter" category in settings, made it more consistent
parent
cff4177b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!324
Another one of those MR that fixes many many small-to-medium things
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/settings/settings.vue
+11
-10
11 additions, 10 deletions
src/components/settings/settings.vue
src/i18n/messages.js
+5
-0
5 additions, 0 deletions
src/i18n/messages.js
with
16 additions
and
10 deletions
src/components/settings/settings.vue
+
11
−
10
View file @
c3b27ab4
...
...
@@ -35,16 +35,6 @@
<input
type=
"checkbox"
id=
"hoverPreview"
v-model=
"hoverPreviewLocal"
>
<label
for=
"hoverPreview"
>
{{
$t
(
'
settings.reply_link_preview
'
)
}}
</label>
</li>
<li>
<label
for=
"replyVisibility"
class=
"select"
>
<select
id=
"replyVisibility"
v-model=
"replyVisibilityLocal"
>
<option
value=
"all"
selected
>
{{
$t
(
'
settings.reply_visibility_all
'
)
}}
</option>
<option
value=
"following"
>
{{
$t
(
'
settings.reply_visibility_following
'
)
}}
</option>
<option
value=
"self"
>
{{
$t
(
'
settings.reply_visibility_self
'
)
}}
</option>
</select>
<i
class=
"icon-down-open"
/>
</label>
</li>
</ul>
</div>
<div
class=
"setting-item"
>
...
...
@@ -90,6 +80,17 @@
</div>
<div
:title=
"$t('settings.filtering')"
>
<div
class=
"setting-item"
>
{{
$t
(
'
settings.replies_in_timeline
'
)
}}
<label
for=
"replyVisibility"
class=
"select"
>
<select
id=
"replyVisibility"
v-model=
"replyVisibilityLocal"
>
<option
value=
"all"
selected
>
{{
$t
(
'
settings.reply_visibility_all
'
)
}}
</option>
<option
value=
"following"
>
{{
$t
(
'
settings.reply_visibility_following
'
)
}}
</option>
<option
value=
"self"
>
{{
$t
(
'
settings.reply_visibility_self
'
)
}}
</option>
</select>
<i
class=
"icon-down-open"
/>
</label>
</div>
<div
class=
"setting-item"
>
<p>
{{
$t
(
'
settings.filtering_explanation
'
)
}}
</p>
<textarea
id=
"muteWords"
v-model=
"muteWordsString"
></textarea>
...
...
This diff is collapsed.
Click to expand it.
src/i18n/messages.js
+
5
−
0
View file @
c3b27ab4
...
...
@@ -327,6 +327,7 @@ const en = {
loop_video
:
'
Loop videos
'
,
loop_video_silent_only
:
'
Loop only videos without sound (i.e. Mastodon
\'
s "gifs")
'
,
reply_link_preview
:
'
Enable reply-link preview on mouse hover
'
,
replies_in_timeline
:
'
Replies in timeline
'
,
reply_visibility_all
:
'
Show all replies
'
,
reply_visibility_following
:
'
Only show replies directed at me or users I
\'
m following
'
,
reply_visibility_self
:
'
Only show replies directed at me
'
,
...
...
@@ -1674,6 +1675,10 @@ const ru = {
loop_video
:
'
Зациливать видео
'
,
loop_video_silent_only
:
'
Зацикливать только беззвучные видео (т.е. "гифки" с Mastodon)
'
,
reply_link_preview
:
'
Включить предварительный просмотр ответа при наведении мыши
'
,
replies_in_timeline
:
'
Ответы в ленте
'
,
reply_visibility_all
:
'
Показывать все ответы
'
,
reply_visibility_following
:
'
Показывать только ответы мне и тех на кого я подписан
'
,
reply_visibility_self
:
'
Показывать только ответы мне
'
,
follow_import
:
'
Импортировать читаемых
'
,
import_followers_from_a_csv_file
:
'
Импортировать читаемых из файла .csv
'
,
follows_imported
:
'
Список читаемых импортирован. Обработка займёт некоторое время..
'
,
...
...
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