aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md1
-rw-r--r--src/components/settings_modal/tabs/notifications_tab.vue23
-rw-r--r--src/i18n/en.json9
3 files changed, 8 insertions, 25 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49ec550c..0159fa01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Greentext now has separate color slot for it
- Removed the use of with_move parameters when fetching notifications
- Push notifications now are the same as normal notfication, and are localized.
+- Updated Notification Settings to match new BE API
### Fixed
- Weird bug related to post being sent seemingly after pasting with keyboard (hopefully)
diff --git a/src/components/settings_modal/tabs/notifications_tab.vue b/src/components/settings_modal/tabs/notifications_tab.vue
index b7a3cb37..eb9d5598 100644
--- a/src/components/settings_modal/tabs/notifications_tab.vue
+++ b/src/components/settings_modal/tabs/notifications_tab.vue
@@ -6,23 +6,8 @@
<span class="label">{{ $t('settings.notification_setting') }}</span>
<ul class="option-list">
<li>
- <Checkbox v-model="notificationSettings.follows">
- {{ $t('settings.notification_setting_follows') }}
- </Checkbox>
- </li>
- <li>
- <Checkbox v-model="notificationSettings.followers">
- {{ $t('settings.notification_setting_followers') }}
- </Checkbox>
- </li>
- <li>
- <Checkbox v-model="notificationSettings.non_follows">
- {{ $t('settings.notification_setting_non_follows') }}
- </Checkbox>
- </li>
- <li>
- <Checkbox v-model="notificationSettings.non_followers">
- {{ $t('settings.notification_setting_non_followers') }}
+ <Checkbox v-model="notificationSettings.block_from_strangers">
+ {{ $t('settings.notification_setting_block_from_strangers') }}
</Checkbox>
</li>
</ul>
@@ -32,8 +17,8 @@
<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 v-model="notificationSettings.hide_notification_contents">
+ {{ $t('settings.notification_setting_hide_notification_contents') }}
</Checkbox>
</p>
</div>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 796a527c..de81c92e 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -435,13 +435,10 @@
"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": "Block notifications from:",
+ "notification_setting_block_from_strangers": "Users who you do not follow",
"notification_setting_privacy": "Privacy",
- "notification_setting_privacy_option": "Hide the sender and contents of push notifications",
+ "notification_setting_hide_notification_contents": "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",