diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | src/components/settings_modal/tabs/notifications_tab.vue | 17 | ||||
| -rw-r--r-- | src/i18n/en.json | 7 | ||||
| -rw-r--r-- | src/i18n/es.json | 7 | ||||
| -rw-r--r-- | src/i18n/eu.json | 9 | ||||
| -rw-r--r-- | src/i18n/ja_easy.json | 7 | ||||
| -rw-r--r-- | src/i18n/ja_pedantic.json | 7 | ||||
| -rw-r--r-- | src/i18n/nb.json | 7 | ||||
| -rw-r--r-- | src/i18n/oc.json | 9 |
9 files changed, 30 insertions, 41 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index feabbf06..412cdfdd 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..19dedf45 100644 --- a/src/components/settings_modal/tabs/notifications_tab.vue +++ b/src/components/settings_modal/tabs/notifications_tab.vue @@ -6,23 +6,18 @@ <span class="label">{{ $t('settings.notification_setting') }}</span> <ul class="option-list"> <li> - <Checkbox v-model="notificationSettings.follows"> - {{ $t('settings.notification_setting_follows') }} + <Checkbox v-model="notificationSettings.from_following"> + {{ $t('settings.notification_setting_from_following') }} </Checkbox> </li> <li> - <Checkbox v-model="notificationSettings.followers"> - {{ $t('settings.notification_setting_followers') }} + <Checkbox v-model="notificationSettings.from_followers"> + {{ $t('settings.notification_setting_from_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.from_strangers"> + {{ $t('settings.notification_setting_from_strangers') }} </Checkbox> </li> </ul> diff --git a/src/i18n/en.json b/src/i18n/en.json index 4553d25d..ea445830 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -414,10 +414,9 @@ "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_from_following": "Users you follow", + "notification_setting_from_followers": "Users who follow you", + "notification_setting_from_strangers": "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.", diff --git a/src/i18n/es.json b/src/i18n/es.json index 931d4c64..b03d89bd 100644 --- a/src/i18n/es.json +++ b/src/i18n/es.json @@ -345,10 +345,9 @@ }, "notifications": "Notificaciones", "notification_setting": "Recibir notificaciones de:", - "notification_setting_follows": "Usuarios que sigues", - "notification_setting_non_follows": "Usuarios que no sigues", - "notification_setting_followers": "Usuarios que te siguen", - "notification_setting_non_followers": "Usuarios que no te siguen", + "notification_setting_from_following": "Usuarios que sigues", + "notification_setting_from_followers": "Usuarios que te siguen", + "notification_setting_from_strangers": "Usuarios que no te siguen", "notification_mutes": "Para dejar de recibir notificaciones de un usuario específico, siléncialo.", "notification_blocks": "El bloqueo de un usuario detiene todas las notificaciones y también las cancela.", "enable_web_push_notifications": "Habilitar las notificiaciones en el navegador", diff --git a/src/i18n/eu.json b/src/i18n/eu.json index 1c75bf75..8484805f 100644 --- a/src/i18n/eu.json +++ b/src/i18n/eu.json @@ -345,10 +345,9 @@ }, "notifications": "Jakinarazpenak", "notification_setting": "Jaso pertsona honen jakinarazpenak:", - "notification_setting_follows": "Jarraitutako erabiltzaileak", - "notification_setting_non_follows": "Jarraitzen ez dituzun erabiltzaileak", - "notification_setting_followers": "Zu jarraitzen zaituzten erabiltzaileak", - "notification_setting_non_followers": "Zu jarraitzen ez zaituzten erabiltzaileak", + "notification_setting_from_following": "Jarraitutako erabiltzaileak", + "notification_setting_from_followers": "Zu jarraitzen zaituzten erabiltzaileak", + "notification_setting_from_strangers": "Zu jarraitzen ez zaituzten erabiltzaileak", "notification_mutes": "Erabiltzaile jakin baten jakinarazpenak jasotzeari uzteko, isilarazi ezazu.", "notification_blocks": "Erabiltzaile bat blokeatzeak jakinarazpen guztiak gelditzen ditu eta harpidetza ezeztatu.", "enable_web_push_notifications": "Gaitu web jakinarazpenak", @@ -639,4 +638,4 @@ "password_reset_required": "Pasahitza berrezarri behar duzu saioa hasteko.", "password_reset_required_but_mailer_is_disabled": "Pasahitza berrezarri behar duzu, baina pasahitza berrezartzeko aukera desgaituta dago. Mesedez, jarri harremanetan instantziaren administratzailearekin." } -}
\ No newline at end of file +} diff --git a/src/i18n/ja_easy.json b/src/i18n/ja_easy.json index 978e43b3..b547ce6a 100644 --- a/src/i18n/ja_easy.json +++ b/src/i18n/ja_easy.json @@ -383,10 +383,9 @@ "greentext": "ミームやじるし", "notifications": "つうち", "notification_setting": "つうちをうけとる:", - "notification_setting_follows": "あなたがフォローしているひとから", - "notification_setting_non_follows": "あなたがフォローしていないひとから", - "notification_setting_followers": "あなたをフォローしているひとから", - "notification_setting_non_followers": "あなたをフォローしていないひとから", + "notification_setting_from_following": "あなたがフォローしているひとから", + "notification_setting_from_followers": "あなたをフォローしているひとから", + "notification_setting_from_strangers": "あなたをフォローしていないひとから", "notification_mutes": "あるユーザーからのつうちをとめるには、ミュートしてください。", "notification_blocks": "ブロックしているユーザーからのつうちは、すべてとまります。", "enable_web_push_notifications": "ウェブプッシュつうちをゆるす", diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json index 2ca7dca8..186e3f64 100644 --- a/src/i18n/ja_pedantic.json +++ b/src/i18n/ja_pedantic.json @@ -346,10 +346,9 @@ }, "notifications": "通知", "notification_setting": "通知を受け取る:", - "notification_setting_follows": "あなたがフォローしているユーザーから", - "notification_setting_non_follows": "あなたがフォローしていないユーザーから", - "notification_setting_followers": "あなたをフォローしているユーザーから", - "notification_setting_non_followers": "あなたをフォローしていないユーザーから", + "notification_setting_from_following": "あなたがフォローしているユーザーから", + "notification_setting_from_followers": "あなたをフォローしているユーザーから", + "notification_setting_from_strangers": "あなたをフォローしていないユーザーから", "notification_mutes": "特定のユーザーからの通知を止めるには、ミュートしてください。", "notification_blocks": "ブロックしているユーザーからの通知は、すべて止まります。", "enable_web_push_notifications": "ウェブプッシュ通知を許可する", diff --git a/src/i18n/nb.json b/src/i18n/nb.json index 248b05bc..0df14f97 100644 --- a/src/i18n/nb.json +++ b/src/i18n/nb.json @@ -331,10 +331,9 @@ }, "notifications": "Varsler", "notification_setting": "Motta varsler i fra:", - "notification_setting_follows": "Brukere du følger", - "notification_setting_non_follows": "Brukere du ikke følger", - "notification_setting_followers": "Brukere som følger deg", - "notification_setting_non_followers": "Brukere som ikke følger deg", + "notification_setting_from_following": "Brukere du følger", + "notification_setting_from_followers": "Brukere som følger deg", + "notification_setting_from_strangers": "Brukere som ikke følger deg", "notification_mutes": "For å stoppe å motta varsler i fra en spesifikk bruker, kan du dempe dem.", "notification_blocks": "Hvis du blokkerer en bruker vil det stoppe alle varsler og i tilleg få dem til å slutte å følge deg", "enable_web_push_notifications": "Skru på pushnotifikasjoner i nettlesere", diff --git a/src/i18n/oc.json b/src/i18n/oc.json index 680ad6dd..09f64500 100644 --- a/src/i18n/oc.json +++ b/src/i18n/oc.json @@ -289,10 +289,9 @@ }, "notifications": "Notificacions", "notification_setting": "Recebre las notificacions de :", - "notification_setting_follows": "Utilizaires que seguissètz", - "notification_setting_non_follows": "Utilizaires que seguissètz pas", - "notification_setting_followers": "Utilizaires que vos seguisson", - "notification_setting_non_followers": "Utilizaires que vos seguisson pas", + "notification_setting_from_following": "Utilizaires que seguissètz", + "notification_setting_from_followers": "Utilizaires que vos seguisson", + "notification_setting_from_strangers": "Utilizaires que vos seguisson pas", "notification_mutes": "Per recebre pas mai d’un utilizaire en particular, botatz-lo en silenci.", "notification_blocks": "Blocar un utilizaire arrèsta totas las notificacions tan coma quitar de los seguir.", "enable_web_push_notifications": "Activar las notificacions web push", @@ -550,4 +549,4 @@ "people_talking": "{count} personas ne parlan", "no_results": "Cap de resultats" } -}
\ No newline at end of file +} |