Big refactoring of the Inbox (#443)

* Big refactoring of the Inbox

We now have a type that routes an activity through the registered handlers
until one of them matches.

Each Actor/Activity/Object combination is represented by an implementation of AsObject

These combinations are then registered on the Inbox type, which will try to deserialize
the incoming activity in the requested types.

Advantages:
- nicer syntax: the final API is clearer and more idiomatic
- more generic: only two traits (`AsActor` and `AsObject`) instead of one for each kind of activity
- it is easier to see which activities we handle and which one we don't

* Small fixes

- Avoid panics
- Don't search for AP ID infinitely
- Code style issues

* Fix tests

* Introduce a new trait: FromId

It should be implemented for any AP object.

It allows to look for an object in database using its AP ID, or to dereference it if it was not present in database

Also moves the inbox code to plume-models to test it (and write a basic test for each activity type we handle)

* Use if let instead of match

* Don't require PlumeRocket::intl for tests

* Return early and remove a forgotten dbg!

* Add more tests to try to understand where the issues come from

* Also add a test for comment federation

* Don't check creation_date is the same for blogs

* Make user and blog federation more tolerant to errors/missing fields

* Make clippy happy

* Use the correct Accept header when dereferencing

* Fix follow approval with Mastodon

* Add spaces to characters that should not be in usernames

And validate blog names too

* Smarter dereferencing: only do it once for each actor/object

* Forgot some files

* Cargo fmt

* Delete plume_test

* Delete plume_tests

* Update get_id docs + Remove useless : Sized

* Appease cargo fmt

* Remove dbg! + Use as_ref instead of clone when possible + Use and_then instead of map when possible

* Remove .po~

* send unfollow to local instance

* read cover from update activity

* Make sure "cc" and "to" are never empty

and fix a typo in a constant name

* Cargo fmt
This commit is contained in:
Baptiste Gelez
2019-04-17 18:31:47 +01:00
committed by GitHub
parent c19c094e0c
commit 12efe721cc
49 changed files with 2883 additions and 1521 deletions
+17 -13
View File
@@ -42,6 +42,9 @@ msgstr "الصورة الرمزية لـ {0}"
msgid "To create a new blog, you need to be logged in"
msgstr ""
msgid "A blog with the same name already exists."
msgstr "هناك مدونة تحمل نفس التسمية."
#, fuzzy
msgid "You are not allowed to delete this blog."
msgstr "لست مِن محرري هذه المدونة."
@@ -213,8 +216,8 @@ msgid "Allow anyone to register here"
msgstr "السماح للجميع بتسجيل حساب"
#, fuzzy
msgid "Short description - byline"
msgstr "وصف قصير"
msgid "Short description"
msgstr "الوصف الطويل"
#, fuzzy
msgid "Markdown syntax is supported"
@@ -234,7 +237,8 @@ msgstr "حفظ التعديلات"
msgid "About {0}"
msgstr "عن {0}"
msgid "Home to <em>{0}</em> users"
#, fuzzy
msgid "Home to <em>{0}</em> people"
msgstr "يستضيف <em>{0}</em> مستخدمين"
msgid "Who wrote <em>{0}</em> articles"
@@ -372,7 +376,7 @@ msgid "Subscribe"
msgstr ""
#, fuzzy
msgid "{0}'s subscriptions'"
msgid "{0}'s subscriptions"
msgstr "الوصف"
#, fuzzy
@@ -396,7 +400,7 @@ msgid "Plume is a decentralized blogging engine."
msgstr "بلوم محرك لامركزي للمدونات."
#, fuzzy
msgid "Authors can manage various blogs, each as an unique website."
msgid "Authors can manage multiple blogs, each as its own website."
msgstr "يمكن للمدونين إدارة عدة مدونات مِن موقع ويب وحيد."
#, fuzzy
@@ -407,10 +411,6 @@ msgstr ""
"ستكون المقالات معروضة كذلك على مواقع بلوم الأخرى، و يمكنكم التفاعل معها "
"مباشرة عبر أية منصة أخرى مثل ماستدون."
#, fuzzy
msgid "Home to <em>{0}</em> people"
msgstr "يستضيف <em>{0}</em> مستخدمين"
msgid "Read the detailed rules"
msgstr "إقرأ القواعد بالتفصيل"
@@ -647,7 +647,7 @@ msgstr "أعجبني"
#, fuzzy
msgid "One boost"
msgid_plural "{0} boost"
msgid_plural "{0} boosts"
msgstr[0] "بدون مشاركة"
msgstr[1] "مشاركة واحدة"
msgstr[2] "مشاركتان"
@@ -841,6 +841,13 @@ msgstr "قم بنسخه و إلصاقه في محتوى مقالك لعرض ال
msgid "Use as an avatar"
msgstr "استخدمها كصورة رمزية"
#, fuzzy
#~ msgid "Short description - byline"
#~ msgstr "وصف قصير"
#~ msgid "Home to <em>{0}</em> users"
#~ msgstr "يستضيف <em>{0}</em> مستخدمين"
#~ msgid "Login"
#~ msgstr "تسجيل الدخول"
@@ -948,9 +955,6 @@ msgstr "استخدمها كصورة رمزية"
#~ msgid "Invalid name"
#~ msgstr "اسم غير صالح"
#~ msgid "A blog with the same name already exists."
#~ msgstr "هناك مدونة تحمل نفس التسمية."
#~ msgid "Your comment can't be empty"
#~ msgstr "لا يمكن ترك التعليق فارغا"
+13 -12
View File
@@ -40,6 +40,9 @@ msgstr "{0}'s Avatar'"
msgid "To create a new blog, you need to be logged in"
msgstr ""
msgid "A blog with the same name already exists."
msgstr "Ein Blog mit demselben Namen existiert bereits."
#, fuzzy
msgid "You are not allowed to delete this blog."
msgstr "Du bist kein Autor in diesem Blog."
@@ -217,8 +220,8 @@ msgid "Allow anyone to register here"
msgstr "Erlaube jedem die Registrierung"
#, fuzzy
msgid "Short description - byline"
msgstr "Kurze Beschreibung"
msgid "Short description"
msgstr "Lange Beschreibung"
#, fuzzy
msgid "Markdown syntax is supported"
@@ -238,7 +241,7 @@ msgstr "Einstellungen speichern"
msgid "About {0}"
msgstr ""
msgid "Home to <em>{0}</em> users"
msgid "Home to <em>{0}</em> people"
msgstr ""
msgid "Who wrote <em>{0}</em> articles"
@@ -384,7 +387,7 @@ msgid "Subscribe"
msgstr "Abonieren"
#, fuzzy
msgid "{0}'s subscriptions'"
msgid "{0}'s subscriptions"
msgstr "Abonoment"
#, fuzzy
@@ -408,7 +411,7 @@ msgid "Plume is a decentralized blogging engine."
msgstr "Plume ist eine dezentrale Blogging-Engine."
#, fuzzy
msgid "Authors can manage various blogs, each as an unique website."
msgid "Authors can manage multiple blogs, each as its own website."
msgstr "Autoren können verschiedene Blogs von einer Website aus verwalten."
#, fuzzy
@@ -419,9 +422,6 @@ msgstr ""
"Artikel sind auch auf anderen Plume-Websites sichtbar und es ist möglich aus "
"anderen Plattformen wie Mastodon mit diesen zu interagieren."
msgid "Home to <em>{0}</em> people"
msgstr ""
msgid "Read the detailed rules"
msgstr "Lies die detailierten Regeln"
@@ -652,7 +652,7 @@ msgstr ""
#, fuzzy
msgid "One boost"
msgid_plural "{0} boost"
msgid_plural "{0} boosts"
msgstr[0] "Ein Boost"
msgstr[1] "{0} Boosts"
@@ -849,6 +849,10 @@ msgstr "Um diese Mediendatei einzufügen, kopiere sie in deine Artikel."
msgid "Use as an avatar"
msgstr "Als Avatar verwenden"
#, fuzzy
#~ msgid "Short description - byline"
#~ msgstr "Kurze Beschreibung"
#, fuzzy
#~ msgid "You need to be logged in order to create a new blog"
#~ msgstr "Du musst eingeloggt sein, um einen neuen Beitrag zu schreiben"
@@ -1019,9 +1023,6 @@ msgstr "Als Avatar verwenden"
#~ msgid "Invalid name"
#~ msgstr "Ungültiger Name"
#~ msgid "A blog with the same name already exists."
#~ msgstr "Ein Blog mit demselben Namen existiert bereits."
#~ msgid "Your comment can't be empty"
#~ msgstr "Dein Kommentar kann nicht leer sein"
+9 -8
View File
@@ -42,6 +42,10 @@ msgstr ""
msgid "To create a new blog, you need to be logged in"
msgstr ""
# src/routes/blogs.rs:111
msgid "A blog with the same name already exists."
msgstr ""
# src/routes/blogs.rs:136
msgid "You are not allowed to delete this blog."
msgstr ""
@@ -213,7 +217,7 @@ msgstr ""
msgid "Allow anyone to register here"
msgstr ""
msgid "Short description - byline"
msgid "Short description"
msgstr ""
msgid "Markdown syntax is supported"
@@ -232,7 +236,7 @@ msgstr ""
msgid "About {0}"
msgstr ""
msgid "Home to <em>{0}</em> users"
msgid "Home to <em>{0}</em> people"
msgstr ""
msgid "Who wrote <em>{0}</em> articles"
@@ -364,7 +368,7 @@ msgstr ""
msgid "Subscribe"
msgstr ""
msgid "{0}'s subscriptions'"
msgid "{0}'s subscriptions"
msgstr ""
msgid "{0}'s subscribers"
@@ -385,7 +389,7 @@ msgstr ""
msgid "Plume is a decentralized blogging engine."
msgstr ""
msgid "Authors can manage various blogs, each as an unique website."
msgid "Authors can manage multiple blogs, each as its own website."
msgstr ""
msgid ""
@@ -393,9 +397,6 @@ msgid ""
"with them directly from other platforms like Mastodon."
msgstr ""
msgid "Home to <em>{0}</em> people"
msgstr ""
msgid "Read the detailed rules"
msgstr ""
@@ -614,7 +615,7 @@ msgid "Add yours"
msgstr ""
msgid "One boost"
msgid_plural "{0} boost"
msgid_plural "{0} boosts"
msgstr[0] ""
msgstr[1] ""
+9 -8
View File
@@ -41,6 +41,10 @@ msgstr ""
msgid "To create a new blog, you need to be logged in"
msgstr ""
# src/routes/blogs.rs:111
msgid "A blog with the same name already exists."
msgstr ""
# src/routes/blogs.rs:136
msgid "You are not allowed to delete this blog."
msgstr ""
@@ -208,7 +212,7 @@ msgstr ""
msgid "Allow anyone to register here"
msgstr ""
msgid "Short description - byline"
msgid "Short description"
msgstr ""
msgid "Markdown syntax is supported"
@@ -227,7 +231,7 @@ msgstr ""
msgid "About {0}"
msgstr ""
msgid "Home to <em>{0}</em> users"
msgid "Home to <em>{0}</em> people"
msgstr ""
msgid "Who wrote <em>{0}</em> articles"
@@ -356,7 +360,7 @@ msgstr ""
msgid "Subscribe"
msgstr ""
msgid "{0}'s subscriptions'"
msgid "{0}'s subscriptions"
msgstr ""
msgid "{0}'s subscribers"
@@ -377,7 +381,7 @@ msgstr ""
msgid "Plume is a decentralized blogging engine."
msgstr ""
msgid "Authors can manage various blogs, each as an unique website."
msgid "Authors can manage multiple blogs, each as its own website."
msgstr ""
msgid ""
@@ -385,9 +389,6 @@ msgid ""
"with them directly from other platforms like Mastodon."
msgstr ""
msgid "Home to <em>{0}</em> people"
msgstr ""
msgid "Read the detailed rules"
msgstr ""
@@ -611,7 +612,7 @@ msgid "Add yours"
msgstr "Agregue el suyo"
msgid "One boost"
msgid_plural "{0} boost"
msgid_plural "{0} boosts"
msgstr[0] ""
msgstr[1] ""
+18 -13
View File
@@ -43,6 +43,10 @@ msgstr "Avatar de {0}"
msgid "To create a new blog, you need to be logged in"
msgstr ""
#, fuzzy
msgid "A blog with the same name already exists."
msgstr "Un article avec le même titre existe déjà."
#, fuzzy
msgid "You are not allowed to delete this blog."
msgstr "Vous n’êtes pas auteur⋅ice dans ce blog."
@@ -215,8 +219,8 @@ msgid "Allow anyone to register here"
msgstr "Autoriser les inscriptions"
#, fuzzy
msgid "Short description - byline"
msgstr "Description courte"
msgid "Short description"
msgstr "Description longue"
#, fuzzy
msgid "Markdown syntax is supported"
@@ -236,7 +240,8 @@ msgstr "Enregistrer les paramètres"
msgid "About {0}"
msgstr "À propos de {0}"
msgid "Home to <em>{0}</em> users"
#, fuzzy
msgid "Home to <em>{0}</em> people"
msgstr "Accueille <em>{0} personnes"
msgid "Who wrote <em>{0}</em> articles"
@@ -384,7 +389,7 @@ msgid "Subscribe"
msgstr ""
#, fuzzy
msgid "{0}'s subscriptions'"
msgid "{0}'s subscriptions"
msgstr "Description"
#, fuzzy
@@ -408,7 +413,7 @@ msgid "Plume is a decentralized blogging engine."
msgstr "Plume est un moteur de blog décentralisé."
#, fuzzy
msgid "Authors can manage various blogs, each as an unique website."
msgid "Authors can manage multiple blogs, each as its own website."
msgstr ""
"Les auteur⋅ice⋅s peuvent gérer différents blogs au sein dun même site."
@@ -421,10 +426,6 @@ msgstr ""
"pouvez interagir avec directement depuis dautres plateformes telles que "
"Mastodon."
#, fuzzy
msgid "Home to <em>{0}</em> people"
msgstr "Accueille <em>{0} personnes"
msgid "Read the detailed rules"
msgstr "Lire les règles détaillées"
@@ -646,7 +647,7 @@ msgstr ""
#, fuzzy
msgid "One boost"
msgid_plural "{0} boost"
msgid_plural "{0} boosts"
msgstr[0] "{0} partage"
msgstr[1] "{0} partages"
@@ -845,6 +846,13 @@ msgstr "Copiez-le dans vos articles pour insérer ce média."
msgid "Use as an avatar"
msgstr "Utiliser comme avatar"
#, fuzzy
#~ msgid "Short description - byline"
#~ msgstr "Description courte"
#~ msgid "Home to <em>{0}</em> users"
#~ msgstr "Accueille <em>{0} personnes"
#, fuzzy
#~ msgid "You need to be logged in order to create a new blog"
#~ msgstr "Vous devez vous connecter pour écrire un article"
@@ -1019,9 +1027,6 @@ msgstr "Utiliser comme avatar"
#~ msgid "Your comment can't be empty"
#~ msgstr "Votre commentaire ne peut pas être vide."
#~ msgid "A post with the same title already exists."
#~ msgstr "Un article avec le même titre existe déjà."
#, fuzzy
#~ msgid "We need an email, or a username to identify you"
#~ msgstr ""
+13 -12
View File
@@ -39,6 +39,9 @@ msgstr "Avatar de {{ name}}"
msgid "To create a new blog, you need to be logged in"
msgstr ""
msgid "A blog with the same name already exists."
msgstr "Xa existe un blog co mismo nome."
#, fuzzy
msgid "You are not allowed to delete this blog."
msgstr "Vostede non é autora en este blog."
@@ -216,8 +219,8 @@ msgid "Allow anyone to register here"
msgstr "Permitir o rexistro aberto"
#, fuzzy
msgid "Short description - byline"
msgstr "Descrición curta"
msgid "Short description"
msgstr "Descrición longa"
#, fuzzy
msgid "Markdown syntax is supported"
@@ -237,7 +240,7 @@ msgstr "Gardar axustes"
msgid "About {0}"
msgstr ""
msgid "Home to <em>{0}</em> users"
msgid "Home to <em>{0}</em> people"
msgstr ""
msgid "Who wrote <em>{0}</em> articles"
@@ -380,7 +383,7 @@ msgid "Subscribe"
msgstr ""
#, fuzzy
msgid "{0}'s subscriptions'"
msgid "{0}'s subscriptions"
msgstr "Descrición"
#, fuzzy
@@ -404,7 +407,7 @@ msgid "Plume is a decentralized blogging engine."
msgstr "Plume é un motor de publicación descentralizada."
#, fuzzy
msgid "Authors can manage various blogs, each as an unique website."
msgid "Authors can manage multiple blogs, each as its own website."
msgstr "As autoras poden xestionar varios blogs desde un único sitio web."
#, fuzzy
@@ -415,9 +418,6 @@ msgstr ""
"Os artigos son visibles tamén en outros sitios Plume, e pode interactuar "
"coneles desde outras plataformas como Mastadon."
msgid "Home to <em>{0}</em> people"
msgstr ""
msgid "Read the detailed rules"
msgstr "Lea o detalle das normas"
@@ -646,7 +646,7 @@ msgstr ""
#, fuzzy
msgid "One boost"
msgid_plural "{0} boost"
msgid_plural "{0} boosts"
msgstr[0] "Unha promoción"
msgstr[1] "{0} promocións"
@@ -840,6 +840,10 @@ msgstr "Copie para incrustar este contido nos seus artigos"
msgid "Use as an avatar"
msgstr "Utilizar como avatar"
#, fuzzy
#~ msgid "Short description - byline"
#~ msgstr "Descrición curta"
#, fuzzy
#~ msgid "You need to be logged in order to create a new blog"
#~ msgstr "Debe estar conectada para escribir un novo artigo"
@@ -1014,9 +1018,6 @@ msgstr "Utilizar como avatar"
#~ msgid "Invalid name"
#~ msgstr "Nome non válido"
#~ msgid "A blog with the same name already exists."
#~ msgstr "Xa existe un blog co mismo nome."
#~ msgid "Your comment can't be empty"
#~ msgstr "O seu comentario non pode estar baldeiro"
+13 -12
View File
@@ -39,6 +39,9 @@ msgstr "Avatar di {0}"
msgid "To create a new blog, you need to be logged in"
msgstr ""
msgid "A blog with the same name already exists."
msgstr "Un blog con lo stesso nome esiste già."
#, fuzzy
msgid "You are not allowed to delete this blog."
msgstr "Non sei l'autore di questo blog."
@@ -216,8 +219,8 @@ msgid "Allow anyone to register here"
msgstr "Consenti a chiunque di registrarsi"
#, fuzzy
msgid "Short description - byline"
msgstr "Breve descrizione"
msgid "Short description"
msgstr "Descrizione lunga"
#, fuzzy
msgid "Markdown syntax is supported"
@@ -237,7 +240,7 @@ msgstr "Salva impostazioni"
msgid "About {0}"
msgstr ""
msgid "Home to <em>{0}</em> users"
msgid "Home to <em>{0}</em> people"
msgstr ""
msgid "Who wrote <em>{0}</em> articles"
@@ -383,7 +386,7 @@ msgid "Subscribe"
msgstr ""
#, fuzzy
msgid "{0}'s subscriptions'"
msgid "{0}'s subscriptions"
msgstr "Descrizione"
#, fuzzy
@@ -407,7 +410,7 @@ msgid "Plume is a decentralized blogging engine."
msgstr "Plume è un motore di blog decentralizzato."
#, fuzzy
msgid "Authors can manage various blogs, each as an unique website."
msgid "Authors can manage multiple blogs, each as its own website."
msgstr "Gli autori possono gestire vari blog da un unico sito."
#, fuzzy
@@ -418,9 +421,6 @@ msgstr ""
"Gli articoli sono visibili anche da altri siti Plume, e puoi interagire con "
"loro direttamente da altre piattaforme come Mastodon."
msgid "Home to <em>{0}</em> people"
msgstr ""
msgid "Read the detailed rules"
msgstr "Leggi le regole dettagliate"
@@ -651,7 +651,7 @@ msgstr ""
#, fuzzy
msgid "One boost"
msgid_plural "{0} boost"
msgid_plural "{0} boosts"
msgstr[0] "Un Boost"
msgstr[1] "{0} Boost"
@@ -847,6 +847,10 @@ msgstr "Copialo nei tuoi articoli per inserire questo media."
msgid "Use as an avatar"
msgstr "Usa come avatar"
#, fuzzy
#~ msgid "Short description - byline"
#~ msgstr "Breve descrizione"
#, fuzzy
#~ msgid "You need to be logged in order to create a new blog"
#~ msgstr "Devi effettuare l'accesso per scrivere un post"
@@ -1017,9 +1021,6 @@ msgstr "Usa come avatar"
#~ msgid "Invalid name"
#~ msgstr "Nome non valido"
#~ msgid "A blog with the same name already exists."
#~ msgstr "Un blog con lo stesso nome esiste già."
#~ msgid "Your comment can't be empty"
#~ msgstr "Il tuo commento non può essere vuoto"
+13 -12
View File
@@ -42,6 +42,9 @@ msgstr "{{ name}} のアバター"
msgid "To create a new blog, you need to be logged in"
msgstr ""
msgid "A blog with the same name already exists."
msgstr "同じ名前のブログがすでに存在します。"
#, fuzzy
msgid "You are not allowed to delete this blog."
msgstr "あなたはこのブログの作者ではありません。"
@@ -216,8 +219,8 @@ msgid "Allow anyone to register here"
msgstr "不特定多数に登録を許可"
#, fuzzy
msgid "Short description - byline"
msgstr "い説明"
msgid "Short description"
msgstr "い説明"
#, fuzzy
msgid "Markdown syntax is supported"
@@ -237,7 +240,7 @@ msgstr "設定を保存"
msgid "About {0}"
msgstr ""
msgid "Home to <em>{0}</em> users"
msgid "Home to <em>{0}</em> people"
msgstr ""
msgid "Who wrote <em>{0}</em> articles"
@@ -379,7 +382,7 @@ msgid "Subscribe"
msgstr ""
#, fuzzy
msgid "{0}'s subscriptions'"
msgid "{0}'s subscriptions"
msgstr "説明"
#, fuzzy
@@ -403,7 +406,7 @@ msgid "Plume is a decentralized blogging engine."
msgstr "Plume は分散型ブログエンジンです。"
#, fuzzy
msgid "Authors can manage various blogs, each as an unique website."
msgid "Authors can manage multiple blogs, each as its own website."
msgstr "作成者は、ある固有の Web サイトから、さまざまなブログを管理できます。"
#, fuzzy
@@ -414,9 +417,6 @@ msgstr ""
"記事は他の Plume Web サイトからも閲覧可能であり、Mastdon のように他のプラット"
"フォームから直接記事と関わることができます。"
msgid "Home to <em>{0}</em> people"
msgstr ""
msgid "Read the detailed rules"
msgstr "詳細な規則を読む"
@@ -649,7 +649,7 @@ msgstr "いいねする"
#, fuzzy
msgid "One boost"
msgid_plural "{0} boost"
msgid_plural "{0} boosts"
msgstr[0] "{0} ブースト"
#, fuzzy
@@ -837,6 +837,10 @@ msgstr "このメディアを記事に挿入するには、自分の記事にコ
msgid "Use as an avatar"
msgstr "アバターとして使う"
#, fuzzy
#~ msgid "Short description - byline"
#~ msgstr "短い説明"
#~ msgid "Login"
#~ msgstr "ログイン"
@@ -943,9 +947,6 @@ msgstr "アバターとして使う"
#~ msgid "Invalid name"
#~ msgstr "無効な名前"
#~ msgid "A blog with the same name already exists."
#~ msgstr "同じ名前のブログがすでに存在します。"
#~ msgid "Your comment can't be empty"
#~ msgstr "コメントは空にできません"
+14 -13
View File
@@ -42,6 +42,10 @@ msgstr ""
msgid "To create a new blog, you need to be logged in"
msgstr ""
#, fuzzy
msgid "A blog with the same name already exists."
msgstr "Et innlegg med samme navn finnes allerede."
#, fuzzy
msgid "You are not allowed to delete this blog."
msgstr "Du er ikke denne bloggens forfatter."
@@ -222,8 +226,8 @@ msgid "Allow anyone to register here"
msgstr "Tillat at hvem som helst registrerer seg"
#, fuzzy
msgid "Short description - byline"
msgstr "Kort beskrivelse"
msgid "Short description"
msgstr "Lang beskrivelse"
#, fuzzy
msgid "Markdown syntax is supported"
@@ -243,7 +247,7 @@ msgstr "Lagre innstillingene"
msgid "About {0}"
msgstr ""
msgid "Home to <em>{0}</em> users"
msgid "Home to <em>{0}</em> people"
msgstr ""
msgid "Who wrote <em>{0}</em> articles"
@@ -386,7 +390,7 @@ msgid "Subscribe"
msgstr ""
#, fuzzy
msgid "{0}'s subscriptions'"
msgid "{0}'s subscriptions"
msgstr "Lang beskrivelse"
#, fuzzy
@@ -411,7 +415,7 @@ msgid "Plume is a decentralized blogging engine."
msgstr "Plume er et desentralisert bloggsystem."
#, fuzzy
msgid "Authors can manage various blogs, each as an unique website."
msgid "Authors can manage multiple blogs, each as its own website."
msgstr "Forfattere kan administrere forskjellige blogger fra en unik webside."
#, fuzzy
@@ -422,9 +426,6 @@ msgstr ""
"Artiklene er også synlige på andre websider som kjører Plume, og du kan "
"interagere med dem direkte fra andre plattformer som f.eks. Mastodon."
msgid "Home to <em>{0}</em> people"
msgstr ""
msgid "Read the detailed rules"
msgstr "Les reglene"
@@ -673,7 +674,7 @@ msgstr "Legg til din"
#, fuzzy
msgid "One boost"
msgid_plural "{0} boost"
msgid_plural "{0} boosts"
msgstr[0] "Én fremhevning"
msgstr[1] "{0} fremhevninger"
@@ -857,6 +858,10 @@ msgstr ""
msgid "Use as an avatar"
msgstr ""
#, fuzzy
#~ msgid "Short description - byline"
#~ msgstr "Kort beskrivelse"
#~ msgid "Login"
#~ msgstr "Logg inn"
@@ -977,10 +982,6 @@ msgstr ""
#~ msgid "The comment field can't be left empty"
#~ msgstr "Kommentaren din kan ikke være tom"
#, fuzzy
#~ msgid "An article with the same title already exists."
#~ msgstr "Et innlegg med samme navn finnes allerede."
#, fuzzy
#~ msgid "Your password field can't be left empty"
#~ msgstr "Kommentaren din kan ikke være tom"
+17 -12
View File
@@ -38,6 +38,9 @@ msgstr "Awatar {0}"
msgid "To create a new blog, you need to be logged in"
msgstr ""
msgid "A blog with the same name already exists."
msgstr "Blog o tej nazwie już istnieje."
msgid "You are not allowed to delete this blog."
msgstr "Nie masz uprawnień do usunięcia tego bloga."
@@ -204,8 +207,9 @@ msgstr "Nieobowiązkowe"
msgid "Allow anyone to register here"
msgstr "Pozwól każdemu na rejestrację"
msgid "Short description - byline"
msgstr "Krótki opis"
#, fuzzy
msgid "Short description"
msgstr "Szczegółowy opis"
msgid "Markdown syntax is supported"
msgstr "Składnia Markdown jest obsługiwana"
@@ -222,7 +226,7 @@ msgstr "Zapisz te ustawienia"
msgid "About {0}"
msgstr "O {0}"
msgid "Home to <em>{0}</em> users"
msgid "Home to <em>{0}</em> people"
msgstr "Używana przez <em>{0}</em> użytkowników"
msgid "Who wrote <em>{0}</em> articles"
@@ -358,7 +362,7 @@ msgid "Subscribe"
msgstr ""
#, fuzzy
msgid "{0}'s subscriptions'"
msgid "{0}'s subscriptions"
msgstr "Opis"
#, fuzzy
@@ -381,7 +385,7 @@ msgid "Plume is a decentralized blogging engine."
msgstr "Plume jest zdecentralizowanym silnikiem blogowym."
#, fuzzy
msgid "Authors can manage various blogs, each as an unique website."
msgid "Authors can manage multiple blogs, each as its own website."
msgstr "Autorzy mogą zarządzać blogami ze specjalnej strony."
#, fuzzy
@@ -392,9 +396,6 @@ msgstr ""
"Artykuły są widoczne na innych stronach Plume, możesz też wejść w interakcje "
"z nimi na platformach takich jak Mastodon."
msgid "Home to <em>{0}</em> people"
msgstr "Używana przez <em>{0}</em> użytkowników"
msgid "Read the detailed rules"
msgstr "Przeczytaj szczegółowe zasady"
@@ -620,8 +621,9 @@ msgstr "Już tego nie lubię"
msgid "Add yours"
msgstr "Dodaj swoje"
#, fuzzy
msgid "One boost"
msgid_plural "{0} boost"
msgid_plural "{0} boosts"
msgstr[0] "Jedno podbicie"
msgstr[1] "{0} podbicia"
msgstr[2] "{0} podbić"
@@ -805,6 +807,12 @@ msgstr "Skopiuj do swoich artykułów, aby wstawić tę zawartość multimedialn
msgid "Use as an avatar"
msgstr "Użyj jako awataru"
#~ msgid "Short description - byline"
#~ msgstr "Krótki opis"
#~ msgid "Home to <em>{0}</em> users"
#~ msgstr "Używana przez <em>{0}</em> użytkowników"
#~ msgid "Login"
#~ msgstr "Zaloguj się"
@@ -969,9 +977,6 @@ msgstr "Użyj jako awataru"
#~ msgid "Invalid name"
#~ msgstr "Nieprawidłowa nazwa"
#~ msgid "A blog with the same name already exists."
#~ msgstr "Blog o tej nazwie już istnieje."
#~ msgid "Your comment can't be empty"
#~ msgstr "Twój komentarz nie może być pusty"
+23 -22
View File
@@ -40,23 +40,27 @@ msgstr ""
msgid "To create a new blog, you need to be logged in"
msgstr ""
# src/routes/blogs.rs:169
# src/routes/blogs.rs:109
msgid "A blog with the same name already exists."
msgstr ""
# src/routes/blogs.rs:172
msgid "You are not allowed to delete this blog."
msgstr ""
# src/routes/blogs.rs:214
# src/routes/blogs.rs:217
msgid "You are not allowed to edit this blog."
msgstr ""
# src/routes/blogs.rs:253
# src/routes/blogs.rs:262
msgid "You can't use this media as a blog icon."
msgstr ""
# src/routes/blogs.rs:271
# src/routes/blogs.rs:280
msgid "You can't use this media as a blog banner."
msgstr ""
# src/routes/likes.rs:47
# src/routes/likes.rs:51
msgid "To like a post, you need to be logged in"
msgstr ""
@@ -64,27 +68,27 @@ msgstr ""
msgid "To see your notifications, you need to be logged in"
msgstr ""
# src/routes/posts.rs:92
# src/routes/posts.rs:93
msgid "This post isn't published yet."
msgstr ""
# src/routes/posts.rs:120
# src/routes/posts.rs:122
msgid "To write a new post, you need to be logged in"
msgstr ""
# src/routes/posts.rs:138
# src/routes/posts.rs:140
msgid "You are not an author of this blog."
msgstr ""
# src/routes/posts.rs:145
# src/routes/posts.rs:147
msgid "New post"
msgstr ""
# src/routes/posts.rs:190
# src/routes/posts.rs:192
msgid "Edit {0}"
msgstr ""
# src/routes/reshares.rs:47
# src/routes/reshares.rs:51
msgid "To reshare a post, you need to be logged in"
msgstr ""
@@ -104,15 +108,15 @@ msgstr ""
msgid "Sorry, but the link expired. Try again"
msgstr ""
# src/routes/user.rs:148
# src/routes/user.rs:136
msgid "To access your dashboard, you need to be logged in"
msgstr ""
# src/routes/user.rs:187
# src/routes/user.rs:180
msgid "To subscribe to someone, you need to be logged in"
msgstr ""
# src/routes/user.rs:287
# src/routes/user.rs:280
msgid "To edit your profile, you need to be logged in"
msgstr ""
@@ -211,7 +215,7 @@ msgstr ""
msgid "Allow anyone to register here"
msgstr ""
msgid "Short description - byline"
msgid "Short description"
msgstr ""
msgid "Markdown syntax is supported"
@@ -230,7 +234,7 @@ msgstr ""
msgid "About {0}"
msgstr ""
msgid "Home to <em>{0}</em> users"
msgid "Home to <em>{0}</em> people"
msgstr ""
msgid "Who wrote <em>{0}</em> articles"
@@ -358,7 +362,7 @@ msgstr ""
msgid "Subscribe"
msgstr ""
msgid "{0}'s subscriptions'"
msgid "{0}'s subscriptions"
msgstr ""
msgid "{0}'s subscribers"
@@ -379,15 +383,12 @@ msgstr ""
msgid "Plume is a decentralized blogging engine."
msgstr ""
msgid "Authors can manage various blogs, each as an unique website."
msgid "Authors can manage multiple blogs, each as its own website."
msgstr ""
msgid "Articles are also visible on other Plume instances, and you can interact with them directly from other platforms like Mastodon."
msgstr ""
msgid "Home to <em>{0}</em> people"
msgstr ""
msgid "Read the detailed rules"
msgstr ""
@@ -601,7 +602,7 @@ msgid "Add yours"
msgstr ""
msgid "One boost"
msgid_plural "{0} boost"
msgid_plural "{0} boosts"
msgstr[0] ""
msgid "I don't want to boost this anymore"
+17 -13
View File
@@ -41,6 +41,9 @@ msgstr "Avatar de {0}"
msgid "To create a new blog, you need to be logged in"
msgstr ""
msgid "A blog with the same name already exists."
msgstr "Um blog com o mesmo nome já existe."
#, fuzzy
msgid "You are not allowed to delete this blog."
msgstr "Você não é autor neste blog."
@@ -212,8 +215,8 @@ msgid "Allow anyone to register here"
msgstr "Permitir que qualquer pessoa se registre"
#, fuzzy
msgid "Short description - byline"
msgstr "Descrição breve"
msgid "Short description"
msgstr "Descrição longa"
#, fuzzy
msgid "Markdown syntax is supported"
@@ -233,7 +236,8 @@ msgstr "Salvar configurações"
msgid "About {0}"
msgstr "Sobre {0}"
msgid "Home to <em>{0}</em> users"
#, fuzzy
msgid "Home to <em>{0}</em> people"
msgstr "Acolhe <em>{0}</em> pessoas"
msgid "Who wrote <em>{0}</em> articles"
@@ -372,7 +376,7 @@ msgid "Subscribe"
msgstr ""
#, fuzzy
msgid "{0}'s subscriptions'"
msgid "{0}'s subscriptions"
msgstr "Descrição"
#, fuzzy
@@ -396,7 +400,7 @@ msgid "Plume is a decentralized blogging engine."
msgstr "Plume é um motor de blogs descentralizado."
#, fuzzy
msgid "Authors can manage various blogs, each as an unique website."
msgid "Authors can manage multiple blogs, each as its own website."
msgstr "Os autores podem gerenciar vários blogs a partir de um único site."
#, fuzzy
@@ -407,10 +411,6 @@ msgstr ""
"Os artigos também são visíveis em outros sites Plume, e você pode interagir "
"com eles diretamente de outras plataformas como Mastodon."
#, fuzzy
msgid "Home to <em>{0}</em> people"
msgstr "Acolhe <em>{0}</em> pessoas"
msgid "Read the detailed rules"
msgstr "Leia as regras detalhadas"
@@ -642,7 +642,7 @@ msgid "Add yours"
msgstr "Eu gosto"
msgid "One boost"
msgid_plural "{0} boost"
msgid_plural "{0} boosts"
msgstr[0] ""
msgstr[1] ""
@@ -826,6 +826,13 @@ msgstr "Copie-o em seus artigos para inserir esta mídia."
msgid "Use as an avatar"
msgstr "Utilizar como avatar"
#, fuzzy
#~ msgid "Short description - byline"
#~ msgstr "Descrição breve"
#~ msgid "Home to <em>{0}</em> users"
#~ msgstr "Acolhe <em>{0}</em> pessoas"
#~ msgid "Login"
#~ msgstr "Entrar"
@@ -922,9 +929,6 @@ msgstr "Utilizar como avatar"
#~ msgid "Unknown error"
#~ msgstr "Erro desconhecido"
#~ msgid "A blog with the same name already exists."
#~ msgstr "Um blog com o mesmo nome já existe."
#~ msgid "Your comment can't be empty"
#~ msgstr "O seu comentário não pode estar vazio"
+13 -12
View File
@@ -41,6 +41,9 @@ msgstr "Аватар {0}"
msgid "To create a new blog, you need to be logged in"
msgstr ""
msgid "A blog with the same name already exists."
msgstr "Блог с таким же названием уже существует."
#, fuzzy
msgid "You are not allowed to delete this blog."
msgstr "Вы не автор этого блога."
@@ -221,8 +224,8 @@ msgid "Allow anyone to register here"
msgstr "Позволить регистрироваться кому угодно"
#, fuzzy
msgid "Short description - byline"
msgstr "Краткое описание"
msgid "Short description"
msgstr "Длинное описание"
#, fuzzy
msgid "Markdown syntax is supported"
@@ -242,7 +245,7 @@ msgstr "Сохранить настройки"
msgid "About {0}"
msgstr ""
msgid "Home to <em>{0}</em> users"
msgid "Home to <em>{0}</em> people"
msgstr ""
msgid "Who wrote <em>{0}</em> articles"
@@ -387,7 +390,7 @@ msgid "Subscribe"
msgstr ""
#, fuzzy
msgid "{0}'s subscriptions'"
msgid "{0}'s subscriptions"
msgstr "Описание"
#, fuzzy
@@ -411,7 +414,7 @@ msgid "Plume is a decentralized blogging engine."
msgstr "Plume это децентрализованный движок для блоггинга."
#, fuzzy
msgid "Authors can manage various blogs, each as an unique website."
msgid "Authors can manage multiple blogs, each as its own website."
msgstr "Авторы могут управлять различными блогами с одного сайта."
#, fuzzy
@@ -422,9 +425,6 @@ msgstr ""
"Статьи также видны на других сайтах Plume и вы можете взаимодействовать с "
"ними напрямую из других платформ, таких как Mastodon."
msgid "Home to <em>{0}</em> people"
msgstr ""
msgid "Read the detailed rules"
msgstr "Прочитать подробные правила"
@@ -652,7 +652,7 @@ msgstr ""
#, fuzzy
msgid "One boost"
msgid_plural "{0} boost"
msgid_plural "{0} boosts"
msgstr[0] "Одно продвижение"
msgstr[1] "{0} продвижения"
msgstr[2] "{0} продвижений"
@@ -852,6 +852,10 @@ msgstr ""
msgid "Use as an avatar"
msgstr "Использовать как аватар"
#, fuzzy
#~ msgid "Short description - byline"
#~ msgstr "Краткое описание"
#, fuzzy
#~ msgid "You need to be logged in order to create a new blog"
#~ msgstr "Вы должны войти чтобы написать новый пост"
@@ -1033,9 +1037,6 @@ msgstr "Использовать как аватар"
#~ msgid "Invalid name"
#~ msgstr "Неправильное имя"
#~ msgid "A blog with the same name already exists."
#~ msgstr "Блог с таким же названием уже существует."
#~ msgid "Your comment can't be empty"
#~ msgstr "Ваш комментарий не может быть пустым"