Compromise between Mastodon and Monsterpit treatment of boosts

2 files changed, 15 insertions, 2 deletions

diff --git a/config/locales/en-MP.yml b/config/locales/en-MP.yml
index 481787c00..8b0c6d29b 100644
--- a/config/locales/en-MP.yml
+++ b/config/locales/en-MP.yml
@@ -99,6 +99,19 @@ en-MP:
   exports:
     archive_takeout:
       hint_html: You can request an archive of your <strong>roars and media</strong>. The exported data will be in the ActivityPub format, readable by any compliant software. You can request an archive every 7 days.
+  history:
+    '0': Never
+    1: 1 week
+    2: 2 weeks
+    3: 3 weeks
+    6: 6 weeks
+    12: 12 weeks
+    18: 18 weeks
+    24: 24 weeks
+    36: 36 weeks
+    52: 52 weeks
+    104: 104 weeks
+    156: 156 weeks
   notification_mailer:
     favourite:
       body: 'Your status was admired by %{name}:'
diff --git a/config/locales/simple_form.en-MP.yml b/config/locales/simple_form.en-MP.yml
index 65b62b9de..d8ff84775 100644
--- a/config/locales/simple_form.en-MP.yml
+++ b/config/locales/simple_form.en-MP.yml
@@ -26,7 +26,7 @@ en-MP:
         setting_default_content_type_console_html: <code>Plain-text console formatting.</code>
         setting_default_content_type_bbcode_html: "<strong>[b]Bold[/b]</strong>, <u>[u]Underline[/u]</u>, <em>[i]Italic[/i]</em>, <code>[code]Console[/code]</code>, ..."
         setting_default_language: The language of your roars can be detected automatically, but it's not always accurate
-        setting_filter_from_unknown: Do not show boosts from unfollowed accounts on your home timeline.  Takes effect for newly-pushed items.
+        setting_filter_unknown: Strictly filter unfollowed authors, including those of boosts, from your home and list timelines.  Takes effect for newly-pushed items.
         setting_no_boosts_home: Filters boosts from the home timeline, reguardless of the app you use.  These boosts will still be available in the Boosts list.
         setting_manual_publish: This allows you to draft, proofread, and edit your roars before publishing them.  You can publish a roar from its <strong>action menu</strong> (the three dots).
         setting_rss_disabled: Improves privacy by turning off your account's public RSS feed.
@@ -55,7 +55,7 @@ en-MP:
         setting_display_media_show_all: Reveal all
         setting_expand_spoilers: Always expand roars marked with content warnings
         setting_favourite_modal: Show confirmation dialog before admiring (applies to Glitch flavour only)
-        setting_filter_from_unknown: Filter boosts from unfollowed accounts
+        setting_filter_unknown: Filter unfollowed authors
         setting_manual_publish: Manually publish roars
         setting_no_boosts_home: Disable boosts in home timeline
         setting_publish_in: Auto-publish