Merge branch 'refactor/notification_settings_more' into 'develop'

Improve layout of the Notifications Filters section

See merge request pleroma/pleroma-fe!1192
This commit is contained in:
Shpuld Shpludson 2020-07-15 15:06:29 +00:00
commit 0478e82bab
2 changed files with 6 additions and 12 deletions

View file

@ -2,16 +2,11 @@
<div :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">
<li>
<p>
<Checkbox v-model="notificationSettings.block_from_strangers">
{{ $t('settings.notification_setting_block_from_strangers') }}
</Checkbox>
</li>
</ul>
</div>
</p>
</div>
<div class="setting-item">

View file

@ -433,8 +433,7 @@
"greentext": "Meme arrows",
"notifications": "Notifications",
"notification_setting_filters": "Filters",
"notification_setting": "Block notifications from:",
"notification_setting_block_from_strangers": "Users who you do not follow",
"notification_setting_block_from_strangers": "Block notifications from users who you do not follow",
"notification_setting_privacy": "Privacy",
"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.",