Merge branch 'refactor/notification_settings' into 'develop'

Updated Notification Settings API use See merge request pleroma/pleroma-fe!1124
2020-07-15 14:29:37 +00:00 · 2020-07-15 14:29:37 +00:00 · 1454d33e53
commit 1454d33e53
parent fd94dba6d0 d4dfc5dcdf
18 changed files with 11 additions and 99 deletions
--- 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)
--- 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>
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@ -399,8 +399,6 @@
    "changed_email": "Email Adresse erfolgreich geändert!",
    "change_email_error": "Es trat ein Problem auf beim Versuch, deine Email Adresse zu ändern.",
    "change_email": "Ändere Email",
-    "notification_setting_non_followers": "Nutzer, die dir nicht folgen",
-    "notification_setting_followers": "Nutzer, die dir folgen",
    "import_blocks_from_a_csv_file": "Importiere Blocks von einer CSV Datei",
    "accent": "Akzent"
  },
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@ -433,13 +433,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",
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@ -342,11 +342,6 @@
      "true": "sí"
    },
    "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_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",
--- a/src/i18n/et.json
+++ b/src/i18n/et.json
@ -302,14 +302,9 @@
    "enable_web_push_notifications": "Luba veebipõhised push-teated",
    "notification_blocks": "Kasutaja blokeerimisel ei tule neilt enam teateid ning nendele teilt ka mitte.",
    "notification_setting_privacy_option": "Peida saatja ning sisu push-teadetelt",
-    "notification_setting": "Saa teateid nendelt:",
    "notifications": "Teated",
    "notification_mutes": "Kui soovid mõnelt kasutajalt mitte teateid saada, kasuta vaigistust.",
    "notification_setting_privacy": "Privaatsus",
-    "notification_setting_non_followers": "Kasutajatelt, kes sind ei jälgi",
-    "notification_setting_followers": "Kasutajatelt, kes jälgivad sind",
-    "notification_setting_non_follows": "Kasutajatelt, keda sa ei jälgi",
-    "notification_setting_follows": "Kasutajatelt, keda jälgid",
    "notification_setting_filters": "Filtrid",
    "greentext": "Meemi nooled",
    "fun": "Naljad",
--- a/src/i18n/eu.json
+++ b/src/i18n/eu.json
@ -342,11 +342,6 @@
      "true": "bai"
    },
    "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_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",
@ -637,4 +632,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."
  }
-}
+}
--- a/src/i18n/fi.json
+++ b/src/i18n/fi.json
@ -282,7 +282,6 @@
    "show_moderator_badge": "Näytä Moderaattori-merkki profiilissani",
    "useStreamingApi": "Vastaanota viestiejä ja ilmoituksia reaaliajassa",
    "notification_setting_filters": "Suodattimet",
-    "notification_setting": "Vastaanota ilmoituksia seuraavista:",
    "notification_setting_privacy_option": "Piilota lähettäjä ja sisältö sovelluksen ulkopuolisista ilmoituksista",
    "enable_web_push_notifications": "Ota käyttöön sovelluksen ulkopuoliset ilmoitukset",
    "app_name": "Sovelluksen nimi",
@ -488,10 +487,6 @@
    "pad_emoji": "Välistä emojit välilyönneillä lisätessäsi niitä valitsimesta",
    "mutes_tab": "Mykistykset",
    "new_email": "Uusi sähköpostiosoite",
-    "notification_setting_follows": "Käyttäjät joita seuraat",
-    "notification_setting_non_follows": "Käyttäjät joita et seuraa",
-    "notification_setting_followers": "Käyttäjät jotka seuraavat sinua",
-    "notification_setting_non_followers": "Käyttäjät jotka eivät seuraa sinua",
    "notification_setting_privacy": "Yksityisyys",
    "notification_mutes": "Jos et halua ilmoituksia joltain käyttäjältä, käytä mykistystä.",
    "notification_blocks": "Estäminen pysäyttää kaikki ilmoitukset käyttäjältä ja poistaa seurauksen.",
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@ -317,11 +317,6 @@
      "true": "oui"
    },
    "notifications": "Notifications",
-    "notification_setting": "Reçevoir les notifications de :",
-    "notification_setting_follows": "Utilisateurs que vous suivez",
-    "notification_setting_non_follows": "Utilisateurs que vous ne suivez pas",
-    "notification_setting_followers": "Utilisateurs qui vous suivent",
-    "notification_setting_non_followers": "Utilisateurs qui ne vous suivent pas",
    "notification_mutes": "Pour stopper la récéption de notifications d'un utilisateur particulier, utilisez un masquage.",
    "notification_blocks": "Bloquer un utilisateur stoppe toute notification et se désabonne de lui.",
    "enable_web_push_notifications": "Activer les notifications de push web",
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@ -336,11 +336,6 @@
    "notification_mutes": "Per non ricevere notifiche da uno specifico utente, zittiscilo.",
    "notification_setting_privacy_option": "Nascondi mittente e contenuti delle notifiche push",
    "notification_setting_privacy": "Privacy",
-    "notification_setting_followers": "Utenti che ti seguono",
-    "notification_setting_non_followers": "Utenti che non ti seguono",
-    "notification_setting_non_follows": "Utenti che non segui",
-    "notification_setting_follows": "Utenti che segui",
-    "notification_setting": "Ricevi notifiche da:",
    "notification_setting_filters": "Filtri",
    "notifications": "Notifiche",
    "greentext": "Frecce da meme",
--- a/src/i18n/ja_easy.json
+++ b/src/i18n/ja_easy.json
@ -380,11 +380,6 @@
    "fun": "おたのしみ",
    "greentext": "ミームやじるし",
    "notifications": "つうち",
-    "notification_setting": "つうちをうけとる:",
-    "notification_setting_follows": "あなたがフォローしているひとから",
-    "notification_setting_non_follows": "あなたがフォローしていないひとから",
-    "notification_setting_followers": "あなたをフォローしているひとから",
-    "notification_setting_non_followers": "あなたをフォローしていないひとから",
    "notification_mutes": "あるユーザーからのつうちをとめるには、ミュートしてください。",
    "notification_blocks": "ブロックしているユーザーからのつうちは、すべてとまります。",
    "enable_web_push_notifications": "ウェブプッシュつうちをゆるす",
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@ -343,11 +343,6 @@
      "true": "はい"
    },
    "notifications": "通知",
-    "notification_setting": "通知を受け取る:",
-    "notification_setting_follows": "あなたがフォローしているユーザーから",
-    "notification_setting_non_follows": "あなたがフォローしていないユーザーから",
-    "notification_setting_followers": "あなたをフォローしているユーザーから",
-    "notification_setting_non_followers": "あなたをフォローしていないユーザーから",
    "notification_mutes": "特定のユーザーからの通知を止めるには、ミュートしてください。",
    "notification_blocks": "ブロックしているユーザーからの通知は、すべて止まります。",
    "enable_web_push_notifications": "ウェブプッシュ通知を許可する",
--- a/src/i18n/nb.json
+++ b/src/i18n/nb.json
@ -328,11 +328,6 @@
      "true": "ja"
    },
    "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_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",
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@ -388,9 +388,6 @@
        "link": "een leuke kleine link"
      }
    },
-    "notification_setting_follows": "Gebruikers die je volgt",
-    "notification_setting_non_follows": "Gebruikers die je niet volgt",
-    "notification_setting_followers": "Gebruikers die je volgen",
    "notification_setting_privacy": "Privacy",
    "notification_setting_privacy_option": "Verberg de afzender en inhoud van push meldingen",
    "notification_mutes": "Om niet langer meldingen te ontvangen van een specifieke gebruiker, kun je deze negeren.",
@ -458,7 +455,6 @@
    "upload_a_photo": "Upload een foto",
    "fun": "Plezier",
    "greentext": "Meme pijlen",
-    "notification_setting": "Ontvang meldingen van:",
    "block_export_button": "Exporteer je geblokkeerde gebruikers naar een csv bestand",
    "block_import_error": "Fout bij importeren blokkades",
    "discoverable": "Sta toe dat dit account ontdekt kan worden in zoekresultaten en andere diensten",
@ -467,7 +463,6 @@
    "hide_follows_description": "Niet tonen wie ik volg",
    "show_moderator_badge": "Moderators badge tonen in mijn profiel",
    "notification_setting_filters": "Filters",
-    "notification_setting_non_followers": "Gebruikers die je niet volgen",
    "notification_blocks": "Door een gebruiker te blokkeren, ontvang je geen meldingen meer van de gebruiker en wordt je abonnement op de gebruiker opgeheven.",
    "version": {
      "frontend_version": "Frontend Versie",
--- a/src/i18n/oc.json
+++ b/src/i18n/oc.json
@ -286,11 +286,6 @@
      "true": "òc"
    },
    "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_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",
@ -548,4 +543,4 @@
    "people_talking": "{count} personas ne parlan",
    "no_results": "Cap de resultats"
  }
-}
+}
--- a/src/i18n/pl.json
+++ b/src/i18n/pl.json
@ -403,11 +403,6 @@
    "fun": "Zabawa",
    "greentext": "Memiczne strzałki",
    "notifications": "Powiadomienia",
-    "notification_setting": "Otrzymuj powiadomienia od:",
-    "notification_setting_follows": "Ludzi których obserwujesz",
-    "notification_setting_non_follows": "Ludzi których nie obserwujesz",
-    "notification_setting_followers": "Ludzi którzy obserwują ciebie",
-    "notification_setting_non_followers": "Ludzi którzy nie obserwują ciebie",
    "notification_mutes": "By przestać otrzymywać powiadomienia od jednego użytkownika, wycisz go.",
    "notification_blocks": "Blokowanie uzytkownika zatrzymuje wszystkie powiadomienia i odsubskrybowuje go.",
    "enable_web_push_notifications": "Włącz powiadomienia push",
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@ -348,12 +348,8 @@
        "link": "ссылка"
      }
    },
-    "notification_setting_non_followers": "Не читающие вас",
    "allow_following_move": "Разрешить автоматически читать новый аккаунт при перемещении на другой сервер",
-    "hide_user_stats": "Не показывать статистику пользователей (например количество читателей)",
-    "notification_setting_followers": "Читающие вас",
-    "notification_setting_follows": "Читаемые вами",
-    "notification_setting_non_follows": "Не читаемые вами"
+    "hide_user_stats": "Не показывать статистику пользователей (например количество читателей)"
  },
  "timeline": {
    "collapse": "Свернуть",
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@ -334,11 +334,6 @@
      "true": "是"
    },
    "notifications": "通知",
-    "notification_setting": "通知来源：",
-    "notification_setting_follows": "你所关注的用户",
-    "notification_setting_non_follows": "你没有关注的用户",
-    "notification_setting_followers": "关注你的用户",
-    "notification_setting_non_followers": "没有关注你的用户",
    "notification_mutes": "要停止收到某个指定的用户的通知，请使用隐藏功能。",
    "notification_blocks": "拉黑一个用户会停掉所有他的通知，等同于取消关注。",
    "enable_web_push_notifications": "启用 web 推送通知",