tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add setting to not aggregate reblogs (#9248)

Browse Source 
* Add setting to not aggregate reblogs

Fixes #9222

* Handle cases where user is nil in add_to_home and add_to_list

* Add hint for setting_aggregate_reblogs option

* Reword setting_aggregate_reblogs label
This commit is contained in:
ThibG
2018-12-09 13:03:01 +01:00
committed by Eugen Rochko
parent 6b78e5b5ab
commit 81bda7d67c
7 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/locales/simple_form.en.yml
View File

@ -19,6 +19,7 @@ en:
password: Use at least 8 characters
phrase: Will be matched regardless of casing in text or content warning of a toot
scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones.
setting_aggregate_reblogs: Do not show new boosts for toots that have been recently boosted (only affects newly-received boosts)
setting_default_language: The language of your toots can be detected automatically, but it's not always accurate
setting_display_media_default: Hide media marked as sensitive
setting_display_media_hide_all: Always hide all media
@ -65,6 +66,7 @@ en:
otp_attempt: Two-factor code
password: Password
phrase: Keyword or phrase
setting_aggregate_reblogs: Group boosts in timelines
setting_auto_play_gif: Auto-play animated GIFs
setting_boost_modal: Show confirmation dialog before boosting
setting_default_language: Posting language