logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: 28938340950e1d0ce42d1de65fe6d3a58e0aa9d4
parent: 9b349b40196778abe1a2cdb1d241d4c9572d305c
Author: Shpuld Shpludson <shp@cock.li>
Date:   Thu,  7 May 2020 20:34:27 +0000

Merge branch 'feat/notification-privacy' into 'develop'

Add notification privacy option to user settings

See merge request pleroma/pleroma-fe!1100

Diffstat:

Msrc/components/user_settings/user_settings.vue12++++++++++++
Msrc/i18n/en.json3+++
2 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue @@ -379,6 +379,7 @@ :label="$t('settings.notifications')" > <div class="setting-item"> + <h2>{{ $t('settings.notification_setting_filters') }}</h2> <div class="select-multiple"> <span class="label">{{ $t('settings.notification_setting') }}</span> <ul class="option-list"> @@ -404,6 +405,17 @@ </li> </ul> </div> + </div> + + <div class="setting-item"> + <h2>{{ $t('settings.notification_setting_privacy') }}</h2> + <p> + <Checkbox v-model="notificationSettings.privacy_option"> + {{ $t('settings.notification_setting_privacy_option') }} + </Checkbox> + </p> + </div> + <div class="setting-item"> <p>{{ $t('settings.notification_mutes') }}</p> <p>{{ $t('settings.notification_blocks') }}</p> <button diff --git a/src/i18n/en.json b/src/i18n/en.json @@ -405,11 +405,14 @@ "fun": "Fun", "greentext": "Meme arrows", "notifications": "Notifications", + "notification_setting_filters": "Filters", "notification_setting": "Receive notifications from:", "notification_setting_follows": "Users you follow", "notification_setting_non_follows": "Users you do not follow", "notification_setting_followers": "Users who follow you", "notification_setting_non_followers": "Users who do not follow you", + "notification_setting_privacy": "Privacy", + "notification_setting_privacy_option": "Hide the sender and contents of push notifications", "notification_mutes": "To stop receiving notifications from a specific user, use a mute.", "notification_blocks": "Blocking a user stops all notifications as well as unsubscribes them.", "enable_web_push_notifications": "Enable web push notifications",