Merge branch 'master' into glitch-soc/master

This commit is contained in:
Thibaut Girka 2020-07-24 11:26:40 +02:00
commit 4d950c71e9
3 changed files with 267 additions and 72 deletions

View file

@ -694,122 +694,308 @@ This document is provided for informational purposes only. Since it is only upda
Following people have contributed to translation of Mastodon: Following people have contributed to translation of Mastodon:
- Zoltán Gera (*Hungarian*) - ᏦᏁᎢᎵᏫ 😷 (*Spanish, Argentina*)
- Kristijan Tkalec (*Slovenian*) - Sveinn í Felli (*Icelandic*)
- taicv (*Vietnamese*)
- ButterflyOfFire (*Arabic; French; Kabyle*)
- Duy (*Vietnamese*)
- Evert Prants (*Estonian*) - Evert Prants (*Estonian*)
- borys_sh (*Ukrainian*) - Zoltán Gera (*Hungarian*)
- ButterflyOfFire (*Arabic; French*) - Daniele Lira Mereb (*Portuguese, Brazilian*)
- Osoitz (*Basque*) - Kristijan Tkalec (*Slovenian*)
- oɹʇuʞ (*Spanish, Argentina*) - stan ionut (*Romanian*)
- koyu (*German*)
- Jeroen (*Dutch*)
- Muha Aliss (*Turkish*)
- 唐宗勛 (*Chinese Simplified*)
- Jeong Arm (*Korean; Esperanto; Japanese*)
- Oguz Ersen (*Turkish*)
- spla (*Catalan*)
- Ramdziana F Y (*Indonesian*) - Ramdziana F Y (*Indonesian*)
- Aditoo17 (*Czech*) - Michal Stanke (*Czech*)
- Xosé M. (*Galician*) - Xosé M. (*Galician; Spanish*)
- Roboron (*Spanish*) - 奈卜拉 (*Chinese Simplified*)
- Alix Rossi (*Corsican; French*) - borys_sh (*Ukrainian*)
- Maya Minatsuki (*Japanese*) - Miguel Mayol (*Spanish; Catalan*)
- Masoud Abkenar (*Persian*) - Besnik_b (*Albanian*)
- Thai Localization (*Thai*) - Thai Localization (*Thai*)
- Marek Ľach (*Slovak; Polish*) - Emanuel Pina (*Portuguese*)
- d5Ziif3K (*Ukrainian*) - Jeong Arm (*Korean; Esperanto; Japanese*)
- Imre Kristoffer Eilertsen (*Norwegian*)
- Danial Behzadi (*Persian*)
- Osoitz (*Basque*)
- Peterandre (*Norwegian Nynorsk; Norwegian*)
- Jeroen (*Dutch*)
- spla (*Catalan; Spanish*)
- Iváns (*Galician*)
- koyu (*German*)
- Sasha Sorokin (*Russian; Vietnamese; Swedish; Catalan; Greek; Hungarian; Armenian; Albanian; Galician; French; Danish; German; Korean; Ukrainian*)
- enolp (*Asturian*)
- Masoud Abkenar (*Persian*)
- lamnatos (*Greek*) - lamnatos (*Greek*)
- Emyn Nant Nefydd (*Welsh*) - Alix Rossi (*Corsican; French*)
- arshat (*Kazakh*)
- FédiQuébec (*French*)
- Marek Ľach (*Slovak; Polish*)
- Muha Aliss (*Turkish*)
- tolstoevsky (*Russian*)
- Emyn-Russell Nt Nefydd (*Welsh*)
- Aditoo17 (*Czech*)
- Maya Minatsuki (*Japanese*)
- ariasuni (*French; Esperanto*)
- Roboron (*Spanish*)
- Alessandro Levati (*Italian*)
- Diluns (*Occitan*) - Diluns (*Occitan*)
- regulartranslator (*Portuguese, Brazilian*)
- vishnuvaratharajan (*Tamil*)
- Marcin Mikołajczak (*Polish*)
- Yi-Jyun Pan (*Chinese Traditional*)
- adrmzz (*Sardinian*)
- d5Ziif3K (*Ukrainian*)
- GiorgioHerbie (*Italian*)
- christalleras (*Norwegian Nynorsk*)
- Taloran (*Norwegian Nynorsk*)
- ThibG (*French; Icelandic*)
- Akarshan Biswas (*Bengali*)
- atarashiako (*Chinese Simplified*) - atarashiako (*Chinese Simplified*)
- 101010 (*Polish*) - 101010 (*Polish*)
- Yi-Jyun Pan (*Chinese Traditional*)
- silkevicious (*Italian*) - silkevicious (*Italian*)
- FédiQuébec (*French*) - Bertil Hedkvist (*Swedish*)
- Jaz-Michael King (*Welsh*) - cybergene (*Japanese*)
- christalleras (*Norwegian Nynorsk*) - norayr (*Armenian*)
- tykayn (*French*) - William(ѕ)ⁿ (*Spanish*)
- Alessandro Levati (*Italian*)
- carolinagiorno (*Portuguese, Brazilian*)
- taoxvx (*Danish*)
- sabri (*Spanish*)
- Sasha Sorokin (*Russian*)
- shioko (*Chinese Simplified*)
- Evgeny Petrov (*Russian*)
- ariasuni (*French; Esperanto*)
- Tiago Epifânio (*Portuguese*) - Tiago Epifânio (*Portuguese*)
- dxwc (*Bengali*) - Mentor Gashi (*Albanian*)
- Jaz-Michael King (*Welsh*)
- carolinagiorno (*Portuguese, Brazilian*)
- Roby Thomas (*Malayalam*)
- Bharat Kumar (*Hindi*)
- tykayn (*French*)
- axi (*Finnish*)
- Selyan Slimane AMIRI (*Kabyle*)
- taoxvx (*Danish*)
- Hrach Mkrtchyan (*Armenian*)
- sabri (*Spanish; Spanish, Argentina*)
- Dewi (*Breton; French*)
- SteinarK (*Norwegian Nynorsk*)
- Mathias B. Vagnes (*Norwegian*)
- dashersyed (*Urdu*)
- ThonyVezbe (*Breton*)
- Acolyte (*Ukrainian*)
- Conight Wang (*Chinese Simplified*)
- Damjan Dimitrioski (*Macedonian*)
- PPNplus (*Thai*)
- Tagomago (*Spanish; French*)
- shioko (*Chinese Simplified*)
- Balázs Meskó (*Hungarian*)
- Evgeny Petrov (*Russian*)
- Gwenn (*Breton*)
- Ryo (*Korean*)
- Rafael H L Moretti (*Portuguese, Brazilian*)
- jaranta (*Finnish*)
- gagik_ (*Armenian*)
- Felicia (*Swedish*)
- Jess Rafn (*Danish*)
- Stasiek Michalski (*Polish*)
- liffon (*Swedish*) - liffon (*Swedish*)
- dxwc (*Bengali*)
- Saederup92 (*Danish*)
- Vanege (*Esperanto*) - Vanege (*Esperanto*)
- jmontane (*Catalan*)
- Johan Schiff (*Swedish*) - Johan Schiff (*Swedish*)
- Arunmozhi (*Tamil*)
- kat (*Ukrainian; Russian*) - kat (*Ukrainian; Russian*)
- Laura (*Polish*)
- oti4500 (*Hungarian; Ukrainian*) - oti4500 (*Hungarian; Ukrainian*)
- diazepan (*Spanish; Spanish, Argentina*)
- Sokratis Alichanidis (*Greek*)
- Rikard Linde (*Swedish*)
- Juan José Salvador Piedra (*Spanish*) - Juan José Salvador Piedra (*Spanish*)
- diazepan (*Spanish*) - marzuquccen (*Kabyle*)
- BurekzFinezt (*Serbian*)
- SHeija (*Finnish*) - SHeija (*Finnish*)
- Jack R (*Spanish*) - Jack R (*Spanish*)
- Saederup92 (*Danish*) - andruhov (*Ukrainian; Russian*)
- Stasiek Michalski (*Polish*) - 森の子リスのミーコの大冒険 (*Japanese*)
- Dewi (*Breton; French*) - るいーね (*Japanese*)
- cybergene (*Japanese*) - Sam Tux (*Bengali*)
- AW Unad (*Indonesian*)
- Andrea Lo Iacono (*Italian*)
- Ray (*Spanish*)
- Unmual (*Spanish*) - Unmual (*Spanish*)
- Ryo (*Korean*) - AW Unad (*Indonesian*)
- Cutls (*Japanese*)
- Ray (*Spanish*)
- Falling Snowdin (*Vietnamese*)
- Andrea Lo Iacono (*Italian*)
- EPEMA (*German*)
- Kinshuk Sunil (*Hindi*)
- Ullas Joseph (*Malayalam*)
- Yu-Pai Liu (*Chinese Traditional*)
- Amarin Cemthong (*Thai*)
- juanda097 (*Spanish*) - juanda097 (*Spanish*)
- Anunnakey (*Macedonian*) - Anunnakey (*Macedonian*)
- Cutls (*Japanese*) - StanleyFrew (*French*)
- erikstl (*Esperanto*) - erikstl (*Esperanto*)
- ruine (*Japanese*)
- MadeInSteak (*Finnish*) - MadeInSteak (*Finnish*)
- Sokratis Alichanidis (*Greek*) - Heimen Stoffels (*Dutch*)
- dragnucs2 (*Arabic*) - Rajarshi Guha (*Bengali*)
- frumble (*German*) - Andrew (*Romanian*)
- Rikard Linde (*Swedish*) - Goudarz Jafari (*Persian*)
- PPNplus (*Thai*)
- arethsu (*Swedish*) - arethsu (*Swedish*)
- EPEMA YT (*German*) - Carlos Solís (*Esperanto*)
- Parthan S Ramanujam (*Tamil*)
- Ali Demirtaş (*Turkish*)
- Kasper Nymand (*Danish*)
- TS (*Finnish*)
- SensDeViata (*Ukrainian*)
- SergioFMiranda (*Portuguese, Brazilian*)
- OctolinGamer (*Portuguese, Brazilian*)
- AzureNya (*Chinese Simplified*)
- Ram varma (*Tamil*)
- 北䑓如法 (*Japanese*)
- frumble (*German*)
- kekkepikkuni (*Tamil*)
- oorsutri (*Tamil*)
- Nithin V (*Tamil*)
- Miro Rauhala (*Finnish*)
- diorama (*Italian*)
- Rhys Harrison (*Esperanto*) - Rhys Harrison (*Esperanto*)
- Guillaume Turchini (*French*)
- Ganesh D (*Marathi*)
- dragnucs2 (*Arabic*)
- Pedro Henrique (*Portuguese, Brazilian*)
- Tejas Harad (*Marathi*)
- Vasanthan (*Tamil*)
- 硫酸鶏 (*Japanese*)
- manukp (*Malayalam*)
- psymyn (*Hebrew*)
- earth dweller (*Marathi*)
- meijerivoi (*Finnish*)
- essaar (*Tamil*)
- serubeena (*Swedish*)
- Rintan (*Japanese*)
- Karol Kosek (*Polish*)
- valarivan (*Tamil*)
- Sebastián Andil (*Slovak*)
- v4vachan (*Malayalam*)
- KEINOS (*Japanese*) - KEINOS (*Japanese*)
- Ivan T. (*Chinese Traditional, Hong Kong*)
- filippodb (*Italian*) - filippodb (*Italian*)
- Balázs Meskó (*Hungarian*)
- JzshAC (*Chinese Simplified*) - JzshAC (*Chinese Simplified*)
- Rintan1 (*Japanese*) - Bottle (*Tamil*)
- Khóo (*Chinese Traditional*)
- Steven Tappert (*German*)
- Antillion (*Spanish*) - Antillion (*Spanish*)
- ZiriSut (*Kabyle*)
- gowthamanb (*Tamil*)
- hiphipvargas (*Portuguese*) - hiphipvargas (*Portuguese*)
- Arttu Ylhävuori (*Finnish*)
- Ch. (*Korean*) - Ch. (*Korean*)
- tctovsli (*Norwegian Nynorsk*) - tctovsli (*Norwegian Nynorsk*)
- Hinaloe (*Japanese*)
- strubbl (*German*)
- vjasiegd (*Polish*) - vjasiegd (*Polish*)
- SamitiMed (*Thai*) - SamitiMed (*Thai*)
- Reg3xp (*Persian*)
- AlexKoala (*Korean*)
- umelard (*Hebrew*) - umelard (*Hebrew*)
- 硫酸鶏 (*Japanese*) - VSx86 (*Russian*)
- Adrián Lattes (*Spanish*)
- Hinaloe (*Japanese*)
- Renato "Lond" Cerqueira (*Portuguese, Brazilian*)
- parnikkapore (*Thai*)
- Marcin Mikołajczak (*Polish*)
- 森の子リスのミーコの大冒険 (*Japanese*)
- Marcepanek_ (*Polish*)
- Sahak Petrosyan (*Armenian*)
- Daniel Dimitrov (*Bulgarian*) - Daniel Dimitrov (*Bulgarian*)
- mynameismonkey (*Welsh*)
- parnikkapore (*Thai*)
- Mo_der Steven (*Chinese Simplified*)
- SKELET (*Danish*)
- Renato "Lond" Cerqueira (*Portuguese, Brazilian*)
- enipra (*Armenian*)
- musix (*Persian*)
- ギャラ (*Chinese Simplified; Japanese*)
- ALEM FARID (*Kabyle*)
- ybardapurkar (*Marathi*)
- Adrián Lattes (*Spanish*)
- rasheedgm (*Kannada*)
- omquylzu (*Latvian*)
- Belkacem Mohammed (*Kabyle*)
- Navjot Singh (*Hindi*)
- Ozai (*German*)
- Sahak Petrosyan (*Armenian*)
- siamano (*Thai; Esperanto*)
- se7entime (*Indonesian*)
- Viorel-Cătălin Răpițeanu (*Romanian*)
- Siddhartha Sarathi Basu (*Bengali*)
- Pachara Chantawong (*Thai*)
- Skew (*French*)
- Zijian Zhao (*Chinese Simplified*)
- Guru Prasath Anandapadmanaban (*Tamil*)
- turtle836 (*German*)
- GatoOscuro (*Spanish*)
- Lamin (*Japanese*)
- Marcepanek_ (*Polish*)
- Yann Aguettaz (*French*)
- Feruz Oripov (*Russian*)
- Mick Onio (*Asturian*)
- hg6 (*Hindi*)
- Malik Mann (*German*)
- padulafacundo (*Spanish*)
- r3dsp1 (*Chinese Traditional, Hong Kong*)
- Tianqi Zhang (*Chinese Simplified*)
- Padraic Calpin (*Slovenian*)
- cenegd (*Chinese Simplified*)
- piupiupiudiu (*Chinese Simplified*)
- Hugh Liu (*Chinese Simplified*) - Hugh Liu (*Chinese Simplified*)
- Rakino (*Chinese Simplified*) - Rakino (*Chinese Simplified*)
- Jothipazhani Nagarajan (*Tamil*)
- Miquel Sabaté Solà (*Catalan*)
- AmazighNM (*Kabyle*)
- Solid Rhino (*Dutch*)
- hallomaurits (*Dutch*)
- hussama (*Portuguese, Brazilian*) - hussama (*Portuguese, Brazilian*)
- ThibG (*French*) - shafouz (*Portuguese, Brazilian*)
- Tagada (*French*)
- Tom_ (*Czech*)
- SnDer (*Dutch*) - SnDer (*Dutch*)
- PifyZ (*French*)
- eichkat3r (*German*) - eichkat3r (*German*)
- Karol Kosek (*Polish*) - PifyZ (*French*)
- Akarshan Biswas (*Bengali*) - OminousCry (*Russian*)
- Shrinivasan T (*Tamil*)
- Nathaël Noguès (*French*)
- Daniel M. (*Catalan*)
- Swati Sani (*Urdu*)
- Kk (*Kannada*)
- SusVersiva (*Catalan*)
- Robin van der Vliet (*Esperanto*)
- Zinkokooo (*Basque*)
- Tradjincal (*French*) - Tradjincal (*French*)
- Steven Tappert (*German*) - Vikatakavi (*Kannada*)
- sergioaraujo1 (*Portuguese, Brazilian*) - prabhjot (*Hindi*)
- twpenguin (*Chinese Traditional*)
- mmokhi (*Persian*) - mmokhi (*Persian*)
- fedot (*Russian*) - sergioaraujo1 (*Portuguese, Brazilian*)
- Livingston Samuel (*Tamil*)
- tsundoker (*Malayalam*)
- skaaarrr (*German*) - skaaarrr (*German*)
- 夜楓Yoka (*Chinese Simplified*)
- kiwi0 (*Italian*)
- fedot (*Russian*)
- mkljczk (*Polish*)
- igordrozniak (*Polish*)
- Ricardo Colin (*Spanish*)
- Esther (*Portuguese*)
- Paz Galindo (*Spanish*)
- Philipp Fischbeck (*German*)
- ralozkolya (*Georgian*)
- JackXu (*Chinese Simplified*) - JackXu (*Chinese Simplified*)
- Lukas Fülling (*German*) - Allen Zhong (*Chinese Simplified*)
- Zoé Bőle (*German*) - Zoé Bőle (*German*)
- Lukas Fülling (*German*)
- Albatroz Jeremias (*Portuguese*)
- Samir Tighzert (*Kabyle*)
- Nocta (*French*)
- Anoop (*Malayalam*)
- pezcurrel (*Italian*)
- Dremski (*Bulgarian*) - Dremski (*Bulgarian*)
- Aymeric (*French*)
- tamaina (*Japanese*) - tamaina (*Japanese*)
- Doug (*Portuguese, Brazilian*)
- Matias Lavik (*Norwegian Nynorsk*)
- Fleva (*Sardinian*)
- OpenAlgeria (*Arabic*) - OpenAlgeria (*Arabic*)
- koppe-pan (*Japanese*)
- Amith Raj Shetty (*Kannada*)
- smedvedev (*Russian*)
- Trond Boksasp (*Norwegian*)
- random_person (*Spanish*)
- Sais Lakshmanan (*Tamil*)
- mikel (*Spanish*)
- Mohammad Adnan Mahmood (*Arabic*)

File diff suppressed because one or more lines are too long

View file

@ -36,7 +36,8 @@ class ProcessMentionsService < BaseService
next match if mention_undeliverable?(mentioned_account) || mentioned_account&.suspended? next match if mention_undeliverable?(mentioned_account) || mentioned_account&.suspended?
mentions << mentioned_account.mentions.where(status: status).first_or_create(status: status) mention = mentioned_account.mentions.new(status: status)
mentions << mention if mention.save
"@#{mentioned_account.acct}" "@#{mentioned_account.acct}"
end end