about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-05-18 02:26:51 +0200
committerGitHub <noreply@github.com>2018-05-18 02:26:51 +0200
commit1e02dc871533de78174b48a6a527f11b0f2bc7ec (patch)
tree85342796b125279d75c6591ef8b9090a11b8b404 /config
parent919eef309820a421d6f5886b8ae811d3924cea97 (diff)
Add preference to hide following/followers lists (#7532)
* Add preference to hide following/followers lists

- Public pages
- ActivityPub collections (does not return pages but does give total)
- REST API (unless it's your own) (does not federate)

Fix #6901

* Add preference

* Add delegation

* Fix issue

* Fix issue
Diffstat (limited to 'config')
-rw-r--r--config/locales/en.yml1
-rw-r--r--config/locales/simple_form.en.yml2
-rw-r--r--config/settings.yml1
3 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c074fa5b0..0257241cf 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -40,6 +40,7 @@ en:
     following: Following
     media: Media
     moved_html: "%{name} has moved to %{new_profile_link}:"
+    network_hidden: This information is not available
     nothing_here: There is nothing here!
     people_followed_by: People whom %{name} follows
     people_who_follow: People who follow %{name}
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 7d6907ff5..85597e9a7 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -15,6 +15,7 @@ en:
         note:
           one: <span class="note-counter">1</span> character left
           other: <span class="note-counter">%{count}</span> characters left
+        setting_hide_network: Who you follow and who follows you will not be shown on your profile
         setting_noindex: Affects your public profile and status pages
         setting_theme: Affects how Mastodon looks when you're logged in from any device.
       imports:
@@ -54,6 +55,7 @@ en:
         setting_default_sensitive: Always mark media as sensitive
         setting_delete_modal: Show confirmation dialog before deleting a toot
         setting_display_sensitive_media: Always show media marked as sensitive
+        setting_hide_network: Hide your network
         setting_noindex: Opt-out of search engine indexing
         setting_reduce_motion: Reduce motion in animations
         setting_system_font_ui: Use system's default font
diff --git a/config/settings.yml b/config/settings.yml
index dcf655008..3581d10a2 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -20,6 +20,7 @@ defaults: &defaults
   timeline_preview: true
   show_staff_badge: true
   default_sensitive: false
+  hide_network: false
   unfollow_modal: false
   boost_modal: false
   delete_modal: true