moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

notification controls: redesign entirely

This commit is contained in:
William Pitcock 2019-05-25 23:44:36 +00:00
parent ac97cd3e46
commit 855566f887
2 changed files with 39 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/components/user_settings/user_settings.vue
View File

@ -167,40 +167,29 @@
</div>
</div>
<div :label="$t('settings.interactions_tab')" v-if="pleromaBackend">
<div :label="$t('settings.notifications')" v-if="pleromaBackend">
<div class="setting-item">
<h2>{{$t('settings.notifications')}}</h2>
<ul class="setting-list">
<li>
<input type="checkbox" id="notification-setting-local" v-model="notificationSettings.local">
<label for="notification-setting-local">
{{$t('settings.notification_setting_local')}}
</label>
</li>
<li>
<input type="checkbox" id="notification-setting-remote" v-model="notificationSettings.remote">
<label for="notification-setting-remote">
{{$t('settings.notification_setting_remote')}}
</label>
</li>
<div class="select-multiple">
<span class="label">{{$t('settings.notification_setting')}}</span>
<ul class="option-list">
<li>
<input type="checkbox" id="notification-setting-follows" v-model="notificationSettings.follows">
<label for="notification-setting-follows">
{{$t('settings.notification_setting_follows')}}
</label>
</li>
<li>
<input type="checkbox" id="notification-setting-non-follows" v-model="notificationSettings.non_follows">
<label for="notification-setting-non-follows">
{{$t('settings.notification_setting_non_follows')}}
</label>
</li>
<li>
<input type="checkbox" id="notification-setting-followers" v-model="notificationSettings.followers">
<label for="notification-setting-followers">
{{$t('settings.notification_setting_followers')}}
</label>
</li>
<li>
<input type="checkbox" id="notification-setting-non-follows" v-model="notificationSettings.non_follows">
<label for="notification-setting-non-follows">
{{$t('settings.notification_setting_non_follows')}}
</label>
</li>
<li>
<input type="checkbox" id="notification-setting-non-followers" v-model="notificationSettings.non_followers">
<label for="notification-setting-non-followers">
@ -208,6 +197,9 @@
</label>
</li>
</ul>
</div>
<p>{{$t('settings.notification_mutes')}}</p>
<p>{{$t('settings.notification_blocks')}}</p>
<button class="btn btn-default" @click="updateNotificationSettings">{{$t('general.submit')}}</button>
</div>
</div>

14
src/i18n/en.json
View File

@ -209,7 +209,6 @@
"loop_video": "Loop videos",
"loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")",
"mutes_tab": "Mutes",
"interactions_tab": "Interactions",
"play_videos_in_modal": "Play videos directly in the media viewer",
"use_contain_fit": "Don't crop the attachment in thumbnails",
"name": "Name",
@ -278,12 +277,13 @@
"true": "yes"
},
"notifications": "Notifications",
"notification_setting_local": "Show notifications from local users",
"notification_setting_remote": "Show notifications from remote users",
"notification_setting_follows": "Show notifications from users you follow",
"notification_setting_non_follows": "Show notifications from users you do not follow",
"notification_setting_followers": "Show notifications from users who follow you",
"notification_setting_non_followers": "Show notifications from users who do not follow you",
"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_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",
"style": {
"switcher": {