diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-05-18 07:53:04 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-05-18 08:47:10 -0500 |
| commit | e0eebba46192e5ef2050347069c4098d33e9ec54 (patch) | |
| tree | e58d15f7bd6d5c5f5ce53d880a7ad89bf3faaab2 /config | |
| parent | 4c0770d6c8dac8177b8891a6fb97ccf440100fc2 (diff) | |
| parent | 57b503d4ef0754e4651eae26b628cba60e1ab4e9 (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 1 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 2 | ||||
| -rw-r--r-- | config/settings.yml | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 0117a9680..2282823d0 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 c0c3b4b85..851b678e1 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_skin: Reskins the selected Mastodon flavour imports: @@ -55,6 +56,7 @@ en: setting_delete_modal: Show confirmation dialog before deleting a toot setting_display_sensitive_media: Always show media marked as sensitive setting_favourite_modal: Show confirmation dialog before favouriting + setting_hide_network: Hide your network setting_noindex: Opt-out of search engine indexing setting_reduce_motion: Reduce motion in animations setting_skin: Skin diff --git a/config/settings.yml b/config/settings.yml index a92a0bfd0..4a3720c2d 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -20,6 +20,7 @@ defaults: &defaults min_invite_role: 'admin' show_staff_badge: true default_sensitive: false + hide_network: false unfollow_modal: false boost_modal: false favourite_modal: false |