Merge pull request #2977 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 20531d1

Gemfile.lock

@@ -273,7 +273,7 @@ GEM
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.60.0)
+    haml_lint (0.61.0)
       haml (>= 5.0)
       parallel (~> 1.10)
       rainbow
@@ -432,7 +432,7 @@ GEM
     nokogiri (1.18.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    oj (3.16.9)
+    oj (3.16.10)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     omniauth (2.1.2)
@@ -770,7 +770,7 @@ GEM
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
     securerandom (0.4.1)
-    selenium-webdriver (4.29.0)
+    selenium-webdriver (4.29.1)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)

app/controllers/api/v2/notifications_controller.rb

@@ -46,7 +46,7 @@ def unread_count
   end
 
   def show
-    @notification = current_account.notifications.without_suspended.find_by!(group_key: params[:group_key])
+    @notification = current_account.notifications.without_suspended.by_group_key(params[:group_key]).take!
     presenter = GroupedNotificationsPresenter.new(NotificationGroup.from_notifications([@notification]))
     render json: presenter, serializer: REST::DedupNotificationGroupSerializer
   end
@@ -57,7 +57,7 @@ def clear
   end
 
   def dismiss
-    current_account.notifications.where(group_key: params[:group_key]).destroy_all
+    current_account.notifications.by_group_key(params[:group_key]).destroy_all
     render_empty
   end
 

app/javascript/mastodon/locales/ar.json

@@ -592,7 +592,6 @@
   "poll_button.remove_poll": "إزالة استطلاع الرأي",
   "privacy.change": "اضبط خصوصية المنشور",
   "privacy.direct.long": "كل من ذُكر في المنشور",
-  "privacy.direct.short": "أشخاص محددون",
   "privacy.private.long": "متابعيك فقط",
   "privacy.private.short": "للمتابِعين",
   "privacy.public.long": "أي شخص على أو خارج ماستدون",

app/javascript/mastodon/locales/be.json

@@ -642,7 +642,6 @@
   "poll_button.remove_poll": "Выдаліць апытанне",
   "privacy.change": "Змяніць прыватнасць допісу",
   "privacy.direct.long": "Усе згаданыя ў допісе",
-  "privacy.direct.short": "Канкрэтныя людзі",
   "privacy.private.long": "Толькі вашыя падпісчыкі",
   "privacy.private.short": "Падпісчыкі",
   "privacy.public.long": "Усе, хто ёсць і каго няма ў Mastodon",

app/javascript/mastodon/locales/bg.json

@@ -697,7 +697,6 @@
   "poll_button.remove_poll": "Премахване на анкета",
   "privacy.change": "Промяна на поверителността на публикация",
   "privacy.direct.long": "Споменатите в публикацията",
-  "privacy.direct.short": "Определени хора",
   "privacy.private.long": "Само последователите ви",
   "privacy.private.short": "Последователи",
   "privacy.public.long": "Всеки във и извън Mastodon",

app/javascript/mastodon/locales/br.json

@@ -436,7 +436,6 @@
   "poll_button.add_poll": "Ouzhpennañ ur sontadeg",
   "poll_button.remove_poll": "Dilemel ar sontadeg",
   "privacy.change": "Cheñch prevezded an embannadur",
-  "privacy.direct.short": "Tud resis",
   "privacy.private.short": "Heulierien",
   "privacy.public.short": "Publik",
   "privacy_policy.last_updated": "Hizivadenn ziwezhañ {date}",

app/javascript/mastodon/locales/ca.json

@@ -696,7 +696,6 @@
   "poll_button.remove_poll": "Elimina l'enquesta",
   "privacy.change": "Canvia la privacitat del tut",
   "privacy.direct.long": "Tothom mencionat a la publicació",
-  "privacy.direct.short": "Persones concretes",
   "privacy.private.long": "Només els vostres seguidors",
   "privacy.private.short": "Seguidors",
   "privacy.public.long": "Tothom dins o fora Mastodon",

app/javascript/mastodon/locales/cs.json

@@ -697,7 +697,7 @@
   "poll_button.remove_poll": "Odebrat anketu",
   "privacy.change": "Změnit soukromí příspěvku",
   "privacy.direct.long": "Všichni zmínění v příspěvku",
-  "privacy.direct.short": "Vybraní lidé",
+  "privacy.direct.short": "Soukromá zmínka",
   "privacy.private.long": "Jen vaši sledující",
   "privacy.private.short": "Sledující",
   "privacy.public.long": "Kdokoliv na Mastodonu i mimo něj",

app/javascript/mastodon/locales/cy.json

@@ -696,7 +696,6 @@
   "poll_button.remove_poll": "Tynnu pleidlais",
   "privacy.change": "Addasu preifatrwdd y post",
   "privacy.direct.long": "Pawb sydd â sôn amdanyn nhw yn y postiad",
-  "privacy.direct.short": "Pobl benodol",
   "privacy.private.long": "Eich dilynwyr yn unig",
   "privacy.private.short": "Dilynwyr",
   "privacy.public.long": "Unrhyw ar ac oddi ar Mastodon",

app/javascript/mastodon/locales/da.json

@@ -697,12 +697,12 @@
   "poll_button.remove_poll": "Fjern afstemning",
   "privacy.change": "Tilpas indlægsfortrolighed",
   "privacy.direct.long": "Alle omtalt i indlægget",
-  "privacy.direct.short": "Bestemte personer",
+  "privacy.direct.short": "Privat omtale",
   "privacy.private.long": "Kun dine følgere",
   "privacy.private.short": "Følgere",
   "privacy.public.long": "Alle på og udenfor Mastodon",
   "privacy.public.short": "Offentlig",
-  "privacy.unlisted.additional": "Dette er præcis som offentlig adfærd, dog vises indlægget ikke i realtids-strømme/etiketter, udforsk eller Mastodon-søgning, selv hvis valget gælder hele kontoen.",
+  "privacy.unlisted.additional": "Dette er præcis som offentlig adfærd, dog vises indlægget ikke i tidslinjer, under etiketter, udforsk eller Mastodon-søgning, selv hvis du ellers har sagt at dine opslag godt må være søgbare.",
   "privacy.unlisted.long": "Færre algoritmiske fanfarer",
   "privacy.unlisted.short": "Stille offentligt",
   "privacy_policy.last_updated": "Senest opdateret {date}",

app/javascript/mastodon/locales/de.json

@@ -697,7 +697,7 @@
   "poll_button.remove_poll": "Umfrage entfernen",
   "privacy.change": "Sichtbarkeit anpassen",
   "privacy.direct.long": "Alle in diesem Beitrag erwähnten Profile",
-  "privacy.direct.short": "Ausgewählte Profile",
+  "privacy.direct.short": "Private Erwähnung",
   "privacy.private.long": "Nur deine Follower",
   "privacy.private.short": "Follower",
   "privacy.public.long": "Alle in und außerhalb von Mastodon",

app/javascript/mastodon/locales/el.json

@@ -697,7 +697,7 @@
   "poll_button.remove_poll": "Αφαίρεση δημοσκόπησης",
   "privacy.change": "Προσαρμογή ιδιωτικότητας ανάρτησης",
   "privacy.direct.long": "Όλοι όσοι αναφέρθηκαν στη δημοσίευση",
-  "privacy.direct.short": "Συγκεκριμένα άτομα",
+  "privacy.direct.short": "Ιδιωτική επισήμανση",
   "privacy.private.long": "Μόνο οι ακόλουθοί σας",
   "privacy.private.short": "Ακόλουθοι",
   "privacy.public.long": "Όλοι εντός και εκτός του Mastodon",

app/javascript/mastodon/locales/en-GB.json

@@ -697,7 +697,7 @@
   "poll_button.remove_poll": "Remove poll",
   "privacy.change": "Change post privacy",
   "privacy.direct.long": "Everyone mentioned in the post",
-  "privacy.direct.short": "Specific people",
+  "privacy.direct.short": "Private mention",
   "privacy.private.long": "Only your followers",
   "privacy.private.short": "Followers",
   "privacy.public.long": "Anyone on and off Mastodon",

app/javascript/mastodon/locales/eo.json

@@ -697,7 +697,7 @@
   "poll_button.remove_poll": "Forigi balotenketon",
   "privacy.change": "Ŝanĝu afiŝan privatecon",
   "privacy.direct.long": "Ĉiuj menciitaj en la afiŝo",
-  "privacy.direct.short": "Specifaj homoj",
+  "privacy.direct.short": "Privata mencio",
   "privacy.private.long": "Nur viaj sekvantoj",
   "privacy.private.short": "Sekvantoj",
   "privacy.public.long": "Ĉiujn ajn ĉe kaj ekster Mastodon",

app/javascript/mastodon/locales/es-AR.json

@@ -697,7 +697,7 @@
   "poll_button.remove_poll": "Quitar encuesta",
   "privacy.change": "Configurar privacidad del mensaje",
   "privacy.direct.long": "Todas las cuentas mencionadas en el mensaje",
-  "privacy.direct.short": "Cuentas específicas",
+  "privacy.direct.short": "Mención privada",
   "privacy.private.long": "Solo tus seguidores",
   "privacy.private.short": "Seguidores",
   "privacy.public.long": "Cualquier persona dentro y fuera de Mastodon",

app/javascript/mastodon/locales/es-MX.json

@@ -697,7 +697,7 @@
   "poll_button.remove_poll": "Eliminar encuesta",
   "privacy.change": "Ajustar privacidad",
   "privacy.direct.long": "Todos los mencionados en la publicación",
-  "privacy.direct.short": "Personas específicas",
+  "privacy.direct.short": "Mención privada",
   "privacy.private.long": "Sólo tus seguidores",
   "privacy.private.short": "Seguidores",
   "privacy.public.long": "Cualquiera dentro y fuera de Mastodon",

app/javascript/mastodon/locales/es.json

@@ -697,7 +697,7 @@
   "poll_button.remove_poll": "Eliminar encuesta",
   "privacy.change": "Ajustar privacidad",
   "privacy.direct.long": "Visible únicamente por los mencionados en la publicación",
-  "privacy.direct.short": "Personas específicas",
+  "privacy.direct.short": "Mención privada",
   "privacy.private.long": "Visible únicamente por tus seguidores",
   "privacy.private.short": "Seguidores",
   "privacy.public.long": "Visible por todo el mundo, dentro y fuera de Mastodon",

app/javascript/mastodon/locales/et.json

@@ -696,7 +696,6 @@
   "poll_button.remove_poll": "Eemalda küsitlus",
   "privacy.change": "Muuda postituse nähtavust",
   "privacy.direct.long": "Kõik postituses mainitud",
-  "privacy.direct.short": "Määratud kasutajad",
   "privacy.private.long": "Ainult jälgijad",
   "privacy.private.short": "Jälgijad",
   "privacy.public.long": "Nii kasutajad kui mittekasutajad",

app/javascript/mastodon/locales/eu.json

@@ -644,7 +644,6 @@
   "poll_button.remove_poll": "Kendu inkesta",
   "privacy.change": "Aldatu bidalketaren pribatutasuna",
   "privacy.direct.long": "Argitalpen honetan aipatutako denak",
-  "privacy.direct.short": "Jende jakina",
   "privacy.private.long": "Soilik jarraitzaileak",
   "privacy.private.short": "Jarraitzaileak",
   "privacy.public.long": "Mastodonen dagoen edo ez dagoen edonor",

app/javascript/mastodon/locales/fa.json

@@ -693,7 +693,6 @@
   "poll_button.remove_poll": "برداشتن نظرسنجی",
   "privacy.change": "تغییر محرمانگی فرسته",
   "privacy.direct.long": "هرکسی که در فرسته نام برده شده",
-  "privacy.direct.short": "افراد مشخّص",
   "privacy.private.long": "تنها پی‌گیرندگانتان",
   "privacy.private.short": "پی‌گیرندگان",
   "privacy.public.long": "هرکسی در و بیرون از ماستودون",

app/javascript/mastodon/locales/fi.json

@@ -697,7 +697,7 @@
   "poll_button.remove_poll": "Poista äänestys",
   "privacy.change": "Muuta julkaisun näkyvyyttä",
   "privacy.direct.long": "Kaikki tässä julkaisussa mainitut",
-  "privacy.direct.short": "Tietyt käyttäjät",
+  "privacy.direct.short": "Yksityismaininta",
   "privacy.private.long": "Vain seuraajasi",
   "privacy.private.short": "Seuraajat",
   "privacy.public.long": "Kuka tahansa Mastodonissa ja sen ulkopuolella",

app/javascript/mastodon/locales/fo.json

@@ -697,7 +697,7 @@
   "poll_button.remove_poll": "Strika atkvøðugreiðslu",
   "privacy.change": "Broyt privatverju av posti",
   "privacy.direct.long": "Øll, sum eru nevnd í postinum",
-  "privacy.direct.short": "Ávís fólk",
+  "privacy.direct.short": "Privat umrøða",
   "privacy.private.long": "Einans tey, ið fylgja tær",
   "privacy.private.short": "Fylgjarar",
   "privacy.public.long": "Øll í og uttanfyri Mastodon",

app/javascript/mastodon/locales/fr-CA.json

@@ -1,6 +1,6 @@
 {
   "about.blocks": "Serveurs modérés",
-  "about.contact": "Contact:",
+  "about.contact": "Contact :",
   "about.disclaimer": "Mastodon est un logiciel open-source gratuit et une marque déposée de Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Raison non disponible",
   "about.domain_blocks.preamble": "Mastodon vous permet généralement de visualiser le contenu et d'interagir avec des comptes de n'importe quel serveur dans le fediverse. Voici les exceptions qui ont été faites sur ce serveur en particulier.",
@@ -697,7 +697,7 @@
   "poll_button.remove_poll": "Supprimer le sondage",
   "privacy.change": "Changer la confidentialité des messages",
   "privacy.direct.long": "Toutes les personnes mentionnées dans le post",
-  "privacy.direct.short": "Personnes spécifiques",
+  "privacy.direct.short": "Mention privée",
   "privacy.private.long": "Seulement vos abonnés",
   "privacy.private.short": "Abonnés",
   "privacy.public.long": "Tout le monde sur et en dehors de Mastodon",

app/javascript/mastodon/locales/fr.json

@@ -697,7 +697,7 @@
   "poll_button.remove_poll": "Supprimer le sondage",
   "privacy.change": "Ajuster la confidentialité du message",
   "privacy.direct.long": "Toutes les personnes mentionnées dans le post",
-  "privacy.direct.short": "Personnes spécifiques",
+  "privacy.direct.short": "Mention privée",
   "privacy.private.long": "Seulement vos abonnés",
   "privacy.private.short": "Abonnés",
   "privacy.public.long": "Tout le monde sur et en dehors de Mastodon",

app/javascript/mastodon/locales/fy.json

@@ -682,7 +682,6 @@
   "poll_button.remove_poll": "Enkête fuortsmite",
   "privacy.change": "Sichtberheid fan berjocht oanpasse",
   "privacy.direct.long": "Elkenien dy’ yn it berjocht fermeld wurdt",
-  "privacy.direct.short": "Bepaalde minsken",
   "privacy.private.long": "Allinnich jo folgers",
   "privacy.private.short": "Folgers",
   "privacy.public.long": "Elkenien op Mastodon en dêrbûten",

app/javascript/mastodon/locales/ga.json

@@ -697,7 +697,6 @@
   "poll_button.remove_poll": "Bain suirbhé",
   "privacy.change": "Athraigh príobháideacht postála",
   "privacy.direct.long": "Luaigh gach duine sa phost",
-  "privacy.direct.short": "Daoine ar leith",
   "privacy.private.long": "Do leanúna amháin",
   "privacy.private.short": "Leantóirí",
   "privacy.public.long": "Duine ar bith ar agus amach Mastodon",

app/javascript/mastodon/locales/gd.json

@@ -633,7 +633,6 @@
   "poll_button.remove_poll": "Thoir air falbh an cunntas-bheachd",
   "privacy.change": "Cuir gleus air prìobhaideachd a’ phuist",
   "privacy.direct.long": "A h-uile duine air a bheil iomradh sa phost",
-  "privacy.direct.short": "Daoine àraidh",
   "privacy.private.long": "An luchd-leantainn agad a-mhàin",
   "privacy.private.short": "Luchd-leantainn",
   "privacy.public.long": "Duine sam bith taobh a-staigh no a-muigh Mhastodon",

app/javascript/mastodon/locales/gl.json

@@ -697,7 +697,7 @@
   "poll_button.remove_poll": "Eliminar enquisa",
   "privacy.change": "Axustar privacidade",
   "privacy.direct.long": "Todas as mencionadas na publicación",
-  "privacy.direct.short": "Persoas mencionadas",
+  "privacy.direct.short": "Mención privada",
   "privacy.private.long": "Só para seguidoras",
   "privacy.private.short": "Seguidoras",
   "privacy.public.long": "Para todas dentro e fóra de Mastodon",

app/javascript/mastodon/locales/he.json

@@ -697,7 +697,7 @@
   "poll_button.remove_poll": "הסרת סקר",
   "privacy.change": "שינוי פרטיות ההודעה",
   "privacy.direct.long": "כל המוזכרים בהודעה",
-  "privacy.direct.short": "א.נשים מסוימים",
+  "privacy.direct.short": "אזכור פרטי",
   "privacy.private.long": "לעוקביך בלבד",
   "privacy.private.short": "עוקבים",
   "privacy.public.long": "כל הגולשים, מחוברים למסטודון או לא",

app/javascript/mastodon/locales/hu.json

@@ -697,7 +697,7 @@
   "poll_button.remove_poll": "Szavazás eltávolítása",
   "privacy.change": "Bejegyzés láthatóságának módosítása",
   "privacy.direct.long": "Mindenki, akit a bejegyzés említ",
-  "privacy.direct.short": "Megadott személyek",
+  "privacy.direct.short": "Privát említés",
   "privacy.private.long": "Csak a követőid",
   "privacy.private.short": "Követők",
   "privacy.public.long": "Bárki a Mastodonon és azon kívül",

app/javascript/mastodon/locales/ia.json

@@ -697,7 +697,7 @@
   "poll_button.remove_poll": "Remover un sondage",
   "privacy.change": "Cambiar le confidentialitate del message",
   "privacy.direct.long": "Tote le personas mentionate in le message",
-  "privacy.direct.short": "Personas specific",
+  "privacy.direct.short": "Mention private",
   "privacy.private.long": "Solmente tu sequitores",
   "privacy.private.short": "Sequitores",
   "privacy.public.long": "Quicunque, sur Mastodon o non",

app/javascript/mastodon/locales/ie.json

@@ -522,7 +522,6 @@
   "poll_button.remove_poll": "Remover balotation",
   "privacy.change": "Changear li privatie del posta",
   "privacy.direct.long": "Omnes mentionat in li posta",
-  "privacy.direct.short": "Specific persones",
   "privacy.private.long": "Solmen tui sequitores",
   "privacy.private.short": "Sequitores",
   "privacy.public.long": "Quicunc in e ex Mastodon",

app/javascript/mastodon/locales/io.json

@@ -606,7 +606,6 @@
   "poll_button.remove_poll": "Efacez votposto",
   "privacy.change": "Aranjar privateso di mesaji",
   "privacy.direct.long": "Omnu quan mencionesis en la posto",
-  "privacy.direct.short": "Specifika personi",
   "privacy.private.long": "Nur vua sequanti",
   "privacy.private.short": "Sequanti",
   "privacy.public.long": "Ulu de e ne de Mastodon",

app/javascript/mastodon/locales/is.json

@@ -697,7 +697,7 @@
   "poll_button.remove_poll": "Fjarlægja könnun",
   "privacy.change": "Aðlaga gagnaleynd færslu",
   "privacy.direct.long": "Allir sem minnst er á í færslunni",
-  "privacy.direct.short": "Tilteknir aðilar",
+  "privacy.direct.short": "Einkaspjall",
   "privacy.private.long": "Einungis þeir sem fylgjast með þér",
   "privacy.private.short": "Fylgjendur",
   "privacy.public.long": "Hver sem er, á og utan Mastodon",

app/javascript/mastodon/locales/it.json

@@ -697,7 +697,7 @@
   "poll_button.remove_poll": "Rimuovi il sondaggio",
   "privacy.change": "Modifica privacy del post",
   "privacy.direct.long": "Tutti quelli menzionati nel post",
-  "privacy.direct.short": "Persone specifiche",
+  "privacy.direct.short": "Menzione privata",
   "privacy.private.long": "Solo i tuoi follower",
   "privacy.private.short": "Follower",
   "privacy.public.long": "Chiunque dentro e fuori Mastodon",

app/javascript/mastodon/locales/ja.json

@@ -697,7 +697,7 @@
   "poll_button.remove_poll": "アンケートを削除",
   "privacy.change": "公開範囲を変更",
   "privacy.direct.long": "本文で指定した相手のみ",
-  "privacy.direct.short": "特定の人",
+  "privacy.direct.short": "非公開の返信",
   "privacy.private.long": "フォロワーのみ",
   "privacy.private.short": "フォロワー",
   "privacy.public.long": "すべての人 (Mastodon以外も含む)",

app/javascript/mastodon/locales/kab.json

@@ -484,7 +484,6 @@
   "poll_button.remove_poll": "Kkes asenqed",
   "privacy.change": "Seggem tabaḍnit n yizen",
   "privacy.direct.long": "Wid akk i d-yettwabdaren deg tsuffeɣt",
-  "privacy.direct.short": "Imdanen yettwafernen",
   "privacy.private.long": "Ala wid i k·m-yeṭṭafaṛen",
   "privacy.private.short": "Imeḍfaren",
   "privacy.public.long": "Kra n win yellan deg Masṭudun neɣ berra-s",

app/javascript/mastodon/locales/ko.json

@@ -697,7 +697,7 @@
   "poll_button.remove_poll": "설문 제거",
   "privacy.change": "게시물의 프라이버시 설정을 변경",
   "privacy.direct.long": "이 게시물에서 언급된 모두",
-  "privacy.direct.short": "특정 인물",
+  "privacy.direct.short": "개인 멘션",
   "privacy.private.long": "내 팔로워만",
   "privacy.private.short": "팔로워",
   "privacy.public.long": "마스토돈 내외 모두",

app/javascript/mastodon/locales/lad.json

@@ -588,7 +588,6 @@
   "poll_button.remove_poll": "Kita anketa",
   "privacy.change": "Troka privasita de publikasyon",
   "privacy.direct.long": "Todos enmentados en la publikasyon",
-  "privacy.direct.short": "Djente espesifika",
   "privacy.private.long": "Solo para tus suivantes",
   "privacy.private.short": "Suivantes",
   "privacy.public.long": "Todos en i afuera de Mastodon",

app/javascript/mastodon/locales/lt.json

@@ -684,7 +684,7 @@
   "poll_button.remove_poll": "Pašalinti apklausą",
   "privacy.change": "Keisti įrašo privatumą",
   "privacy.direct.long": "Visus, paminėtus įraše",
-  "privacy.direct.short": "Konkretūs žmonės",
+  "privacy.direct.short": "Privatus paminėjimas",
   "privacy.private.long": "Tik sekėjams",
   "privacy.private.short": "Sekėjai",
   "privacy.public.long": "Bet kas iš Mastodon ir ne Mastodon",

app/javascript/mastodon/locales/lv.json

@@ -545,7 +545,6 @@
   "poll_button.remove_poll": "Noņemt aptauju",
   "privacy.change": "Mainīt ieraksta privātumu",
   "privacy.direct.long": "Visi ierakstā pieminētie",
-  "privacy.direct.short": "Noteikti cilvēki",
   "privacy.private.long": "Tikai Tavi sekotāji",
   "privacy.private.short": "Sekotāji",
   "privacy.public.long": "Jebkurš Mastodon un ārpus tā",