From 855566f887cb9f705f62141b929bb9a3d089099c Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sat, 25 May 2019 23:44:36 +0000 Subject: [PATCH] notification controls: redesign entirely --- .../user_settings/user_settings.vue | 72 +++++++++---------- src/i18n/en.json | 14 ++-- 2 files changed, 39 insertions(+), 47 deletions(-) diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue index 69f1b44f..20b10979 100644 --- a/src/components/user_settings/user_settings.vue +++ b/src/components/user_settings/user_settings.vue @@ -167,47 +167,39 @@ -
+
-

{{$t('settings.notifications')}}

-
    -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
+
+ {{$t('settings.notification_setting')}} +
    +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
+
+

{{$t('settings.notification_mutes')}}

+

{{$t('settings.notification_blocks')}}

diff --git a/src/i18n/en.json b/src/i18n/en.json index 2840582b..2b5c5468 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -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": {