From e28371bbe4bda5d338ae453a1fbe198f3dc74071 Mon Sep 17 00:00:00 2001 From: Baptiste Gelez Date: Tue, 26 Feb 2019 13:13:00 +0100 Subject: [PATCH] Add a page listing people someone follows (#444) Nothing exceptional, the layout is the same as the followers page. Fixes #325 --- plume-models/src/users.rs | 24 +- po/plume/ar.po | 57 +- po/plume/de.po | 52 +- po/plume/en.po | 20 +- po/plume/es.po | 1038 ++++++++++++++++------------- po/plume/fr.po | 51 +- po/plume/gl.po | 53 +- po/plume/it.po | 53 +- po/plume/ja.po | 60 +- po/plume/nb.po | 59 +- po/plume/pl.po | 60 +- po/plume/plume.pot | 22 +- po/plume/pt.po | 57 +- po/plume/ru.po | 53 +- src/main.rs | 3 +- src/routes/instance.rs | 4 +- src/routes/user.rs | 20 +- src/template_utils.rs | 2 +- templates/instance/feed.rs.html | 2 +- templates/posts/details.rs.html | 2 +- templates/users/details.rs.html | 3 +- templates/users/followed.rs.html | 26 + templates/users/followers.rs.html | 7 +- templates/users/header.rs.html | 4 +- 24 files changed, 1122 insertions(+), 610 deletions(-) create mode 100644 templates/users/followed.rs.html diff --git a/plume-models/src/users.rs b/plume-models/src/users.rs index 72b8b58b..a2a0e290 100644 --- a/plume-models/src/users.rs +++ b/plume-models/src/users.rs @@ -568,7 +568,7 @@ impl User { .map_err(Error::from) } - pub fn get_following(&self, conn: &Connection) -> Result> { + pub fn get_followed(&self, conn: &Connection) -> Result> { use schema::follows::dsl::*; let f = follows.filter(follower_id.eq(self.id)).select(following_id); users::table @@ -577,6 +577,28 @@ impl User { .map_err(Error::from) } + pub fn count_followed(&self, conn: &Connection) -> Result { + use schema::follows; + follows::table + .filter(follows::follower_id.eq(self.id)) + .count() + .get_result(conn) + .map_err(Error::from) + } + + pub fn get_followed_page(&self, conn: &Connection, (min, max): (i32, i32)) -> Result> { + use schema::follows; + let follows = follows::table + .filter(follows::follower_id.eq(self.id)) + .select(follows::following_id) + .limit((max - min).into()); + users::table + .filter(users::id.eq_any(follows)) + .offset(min.into()) + .load::(conn) + .map_err(Error::from) + } + pub fn is_followed_by(&self, conn: &Connection, other_id: i32) -> Result { use schema::follows; follows::table diff --git a/po/plume/ar.po b/po/plume/ar.po index cfc1ea4e..3f016e54 100644 --- a/po/plume/ar.po +++ b/po/plume/ar.po @@ -19,9 +19,9 @@ msgstr "" msgid "{0} commented your article." msgstr "علَّق {0} على مقالك" -#, fuzzy -msgid "{0} is now following you." -msgstr "إنّ {0} يتبعك الآن" +# src/template_utils.rs:35 +msgid "{0} is subscribed to you." +msgstr "" #, fuzzy msgid "{0} liked your article." @@ -73,7 +73,8 @@ msgstr "يجب عليك تسجيل الدخول قصد الإعجاب بالمن msgid "You need to be logged in order to access your dashboard" msgstr "يجب عليك أولا تسجيل الدخول للوصول إلى لوح التحكم" -msgid "You need to be logged in order to follow someone" +#, fuzzy +msgid "You need to be logged in order to subscribe to someone" msgstr "يجب عليك أولا تسجيل الدخول قصد متابعة شخص آخر" msgid "You need to be logged in order to edit your profile" @@ -162,7 +163,8 @@ msgstr "كافة مقالات الفديفرس" msgid "Articles from {}" msgstr "مقالات مِن {0}" -msgid "Nothing to see here yet. Try to follow more people." +#, fuzzy +msgid "Nothing to see here yet. Try to subscribe to more people." msgstr "حاليا لا يوجد أي شيء هنا. حاول متابعة أشخاص آخرين." msgid "Name" @@ -292,8 +294,12 @@ msgstr "" msgid "Articles" msgstr "المقالات" -msgid "Followers" -msgstr "المتابِعون" +msgid "Subscribers" +msgstr "" + +#, fuzzy +msgid "Subscriptions" +msgstr "الوصف" #, fuzzy msgid "Atom feed" @@ -314,14 +320,19 @@ msgstr "تعديل ملفك الشخصي" msgid "Open on {0}" msgstr "افتح على {0}" -msgid "Unfollow" -msgstr "الغاء المتابعة" +msgid "Unsubscribe" +msgstr "" -msgid "Follow" -msgstr "اتبع" +msgid "Subscribe" +msgstr "" -msgid "{0}'s followers" -msgstr "{0} متابِعون" +#, fuzzy +msgid "{0}'s subscriptions'" +msgstr "الوصف" + +#, fuzzy +msgid "{0}'s subscribers" +msgstr "الوصف" msgid "Respond" msgstr "رد" @@ -702,6 +713,26 @@ msgstr "قم بنسخه و إلصاقه في محتوى مقالك لعرض ال msgid "Use as avatar" msgstr "استخدمها كصورة رمزية" +#~ msgid "{0}'s followers" +#~ msgstr "{0} متابِعون" + +#, fuzzy +#~ msgid "{0} is now following you." +#~ msgstr "إنّ {0} يتبعك الآن" + +#, fuzzy +#~ msgid "People {0} follows" +#~ msgstr "{0} متابِعون" + +#~ msgid "Followers" +#~ msgstr "المتابِعون" + +#~ msgid "Unfollow" +#~ msgstr "الغاء المتابعة" + +#~ msgid "Follow" +#~ msgstr "اتبع" + #~ msgid "Comment \"{0}\"" #~ msgstr "تعليق \"{0}\"" diff --git a/po/plume/de.po b/po/plume/de.po index 1a111918..2fdc0fc0 100644 --- a/po/plume/de.po +++ b/po/plume/de.po @@ -18,7 +18,7 @@ msgid "{0} commented your article." msgstr "{0} hat deinen Artikel kommentiert" # src/template_utils.rs:35 -msgid "{0} is now following you." +msgid "{0} is subscribed to you." msgstr "" #, fuzzy @@ -79,7 +79,7 @@ msgid "You need to be logged in order to access your dashboard" msgstr "Du musst eingeloggt sein, um dein Dashboard zu sehen" #, fuzzy -msgid "You need to be logged in order to follow someone" +msgid "You need to be logged in order to subscribe to someone" msgstr "Du musst eingeloggt sein, um jemandem zu folgen" #, fuzzy @@ -175,7 +175,7 @@ msgid "Articles from {}" msgstr "Artikel von {0}" #, fuzzy -msgid "Nothing to see here yet. Try to follow more people." +msgid "Nothing to see here yet. Try to subscribe to more people." msgstr "Hier gibts noch nichts. Versuche dich mehr Leuten anzuschließen." msgid "Name" @@ -315,8 +315,11 @@ msgstr "" msgid "Articles" msgstr "Artikel" -msgid "Followers" -msgstr "Follower" +msgid "Subscribers" +msgstr "Abonomenten" + +msgid "Subscriptions" +msgstr "Abonoment" #, fuzzy msgid "Atom feed" @@ -338,15 +341,19 @@ msgstr "Ändere dein Profil" msgid "Open on {0}" msgstr "" +msgid "Unsubscribe" +msgstr "Abbestellen" + +msgid "Subscribe" +msgstr "Abonieren" + #, fuzzy -msgid "Unfollow" -msgstr "Folgen" +msgid "{0}'s subscriptions'" +msgstr "Abonoment" -msgid "Follow" -msgstr "Folgen" - -msgid "{0}'s followers" -msgstr "{0}s Follower" +#, fuzzy +msgid "{0}'s subscribers" +msgstr "Abonoment" msgid "Respond" msgstr "Antworten" @@ -725,6 +732,27 @@ msgstr "Um diese Mediendatei einzufügen, kopiere sie in deine Artikel." msgid "Use as avatar" msgstr "Als Avatar verwenden" +#~ msgid "{0}'s followers" +#~ msgstr "{0}s Follower" + +#, fuzzy +#~ msgid "People {0} follows" +#~ msgstr "{0}s Follower" + +#~ msgid "Followers" +#~ msgstr "Follower" + +#, fuzzy +#~ msgid "Followed" +#~ msgstr "Folgen" + +#, fuzzy +#~ msgid "Unfollow" +#~ msgstr "Folgen" + +#~ msgid "Follow" +#~ msgstr "Folgen" + #, fuzzy #~ msgid "No articles to see here yet." #~ msgstr "Bisher keine Artikel vorhanden." diff --git a/po/plume/en.po b/po/plume/en.po index c8385bc4..3332bfbf 100644 --- a/po/plume/en.po +++ b/po/plume/en.po @@ -19,7 +19,7 @@ msgid "{0} commented your article." msgstr "" # src/template_utils.rs:35 -msgid "{0} is now following you." +msgid "{0} is subscribed to you." msgstr "" # src/template_utils.rs:36 @@ -83,7 +83,7 @@ msgid "You need to be logged in order to access your dashboard" msgstr "" # src/routes/user.rs:164 -msgid "You need to be logged in order to follow someone" +msgid "You need to be logged in order to subscribe to someone" msgstr "" # src/routes/user.rs:227 @@ -171,7 +171,7 @@ msgstr "" msgid "Articles from {}" msgstr "" -msgid "Nothing to see here yet. Try to follow more people." +msgid "Nothing to see here yet. Try to subscribe to more people." msgstr "" # src/template_utils.rs:144 @@ -299,7 +299,10 @@ msgstr "" msgid "Articles" msgstr "" -msgid "Followers" +msgid "Subscribers" +msgstr "" + +msgid "Subscriptions" msgstr "" msgid "Atom feed" @@ -320,13 +323,16 @@ msgstr "" msgid "Open on {0}" msgstr "" -msgid "Unfollow" +msgid "Unsubscribe" msgstr "" -msgid "Follow" +msgid "Subscribe" msgstr "" -msgid "{0}'s followers" +msgid "{0}'s subscriptions'" +msgstr "" + +msgid "{0}'s subscribers" msgstr "" msgid "Respond" diff --git a/po/plume/es.po b/po/plume/es.po index 9c6c7174..a67d9985 100644 --- a/po/plume/es.po +++ b/po/plume/es.po @@ -14,220 +14,35 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 3.2.2\n" -msgid "Latest articles" -msgstr "Últimas publicaciones" +#, fuzzy +msgid "{0} commented your article." +msgstr "{0} gusto tu publicación" + +# src/template_utils.rs:35 +msgid "{0} is subscribed to you." +msgstr "" #, fuzzy -msgid "No posts to see here yet." -msgstr "No hay publicaciones para ver aquí ahora." +msgid "{0} liked your article." +msgstr "{0} gusto tu publicación" -msgid "New article" -msgstr "Nueva publicación" - -msgid "New blog" -msgstr "Nuevo blog" - -msgid "Create a blog" -msgstr "Crear un blog" - -msgid "Title" -msgstr "Título" - -msgid "Create blog" -msgstr "Crear el blog" - -msgid "Comment \"{0}\"" -msgstr "Comentario \"{0}\"" - -msgid "Content" -msgstr "Contenido" - -msgid "Submit comment" -msgstr "Enviar comentario" - -msgid "Something broke on our side." +msgid "{0} mentioned you." msgstr "" -msgid "Sorry about that. If you think this is a bug, please report it." +#, fuzzy +msgid "{0} boosted your article." +msgstr "{0} gusto tu publicación" + +# src/template_utils.rs:68 +msgid "{0}'s avatar" msgstr "" -"Disculpe la molestia. Si cree que esto es un defecto, por favor repórtalo." - -msgid "Configuration" -msgstr "Configuración" - -msgid "Configure your instance" -msgstr "Configure su instancia" - -msgid "Name" -msgstr "Nombre" - -msgid "Let's go!" -msgstr "Vamos!" - -msgid "Welcome to {0}" -msgstr "Bienvenido(a) a {0}" - -msgid "Notifications" -msgstr "Notificaciones" - -msgid "Written by {0}" -msgstr "Escrito por {0}" - -msgid "This article is under the {0} license." -msgstr "Este artículo está bajo la licencia {0}." - -msgid "One like" -msgid_plural "{0} likes" -msgstr[0] "" -msgstr[1] "" - -msgid "I don't like this anymore" -msgstr "Ya no me gusta" - -msgid "Add yours" -msgstr "Agregue el suyo" - -msgid "One Boost" -msgid_plural "{0} Boosts" -msgstr[0] "" -msgstr[1] "" - -msgid "I don't want to boost this anymore" -msgstr "" - -msgid "Boost" -msgstr "" - -msgid "Comments" -msgstr "Comentários" - -msgid "Respond" -msgstr "Responder" - -msgid "Comment" -msgstr "Comentar" - -msgid "New post" -msgstr "Nueva publicación" - -msgid "Create a post" -msgstr "Crear una publicación" - -msgid "Publish" -msgstr "Publicar" - -msgid "Login" -msgstr "Iniciar Sesión" - -msgid "Username or email" -msgstr "Nombre de usuario o correo electrónico" - -msgid "Password" -msgstr "Contraseña" - -msgid "Dashboard" -msgstr "" - -msgid "Your Dashboard" -msgstr "" - -msgid "Your Blogs" -msgstr "Tus blogs" - -msgid "You don't have any blog yet. Create your own, or ask to join one." -msgstr "Aun no tienes un blog. Crea o pide unirte a uno." - -msgid "Start a new blog" -msgstr "Iniciar un nuevo blog" - -msgid "Admin" -msgstr "" - -msgid "It is you" -msgstr "Eres tú" - -msgid "Edit your profile" -msgstr "Edita tu perfil" - -msgid "Open on {0}" -msgstr "Abrir en {0}" - -msgid "Follow" -msgstr "Seguir" - -msgid "Unfollow" -msgstr "Dejar de seguir" - -msgid "Recently boosted" -msgstr "" - -msgid "One follower" -msgid_plural "{0} followers" -msgstr[0] "Un seguidor" -msgstr[1] "{0} seguidores" - -msgid "Edit your account" -msgstr "Edita tu cuenta" - -msgid "Your Profile" -msgstr "Tu perfil" - -msgid "Display Name" -msgstr "" - -msgid "Email" -msgstr "Correo electrónico" - -msgid "Summary" -msgstr "Resumen" - -msgid "Update account" -msgstr "Actualizar cuenta" - -msgid "{0}'s followers" -msgstr "Los seguidores de {0}" - -msgid "Followers" -msgstr "Seguidores" - -msgid "New Account" -msgstr "Nueva cuenta" - -msgid "Create an account" -msgstr "Crear una cuenta" - -msgid "Username" -msgstr "Nombre de usuario" - -msgid "Password confirmation" -msgstr "Confirmación de contraseña" - -msgid "Create account" -msgstr "Crea una cuenta" - -msgid "Plume" -msgstr "Plume" - -msgid "Menu" -msgstr "Menú" - -msgid "My account" -msgstr "Mi cuenta" - -msgid "Log Out" -msgstr "Cerrar Sesión" - -msgid "Log In" -msgstr "Iniciar Sesión" - -msgid "Register" -msgstr "Registrar" msgid "You need to be logged in order to create a new blog" msgstr "Necesitas iniciar sesión para crear un nuevo blog" -msgid "You need to be logged in order to post a comment" -msgstr "Necesitas iniciar sesión para publicar un comentario" +# src/routes/blogs.rs:136 +msgid "You are not allowed to delete this blog." +msgstr "" msgid "You need to be logged in order to like a post" msgstr "Necesitas iniciar sesión para gustar una publicación" @@ -235,111 +50,63 @@ msgstr "Necesitas iniciar sesión para gustar una publicación" msgid "You need to be logged in order to see your notifications" msgstr "Necesitas iniciar sesión para ver tus notificaciones" +msgid "This post isn't published yet." +msgstr "" + msgid "You need to be logged in order to write a new post" msgstr "Necesitas iniciar sesión para publicar una publicación" -msgid "You need to be logged in order to boost a post" +msgid "You are not author in this blog." msgstr "" -msgid "Invalid username or password" +msgid "New post" +msgstr "Nueva publicación" + +msgid "Edit {0}" msgstr "" +#, fuzzy +msgid "You need to be logged in order to reshare a post" +msgstr "Necesitas iniciar sesión para gustar una publicación" + msgid "You need to be logged in order to access your dashboard" msgstr "" -msgid "You need to be logged in order to follow someone" +#, fuzzy +msgid "You need to be logged in order to subscribe to someone" msgstr "Necesitas iniciar sesión para seguir a alguien" msgid "You need to be logged in order to edit your profile" msgstr "Necesitas iniciar sesión para poder editar tu peril" -#, fuzzy -msgid "By {0}" -msgstr "Por" +msgid "Plume" +msgstr "Plume" -msgid "{0} boosted your article" +msgid "Menu" +msgstr "Menú" + +msgid "Search" msgstr "" -msgid "{0} started following you" -msgstr "{0} comenzó a seguirte" - -msgid "{0} liked your article" -msgstr "{0} gusto tu publicación" - -msgid "{0} commented your article" +msgid "Dashboard" msgstr "" -msgid "We couldn't find this page." -msgstr "" +msgid "Notifications" +msgstr "Notificaciones" -msgid "The link that led you here may be broken." -msgstr "" +msgid "Log Out" +msgstr "Cerrar Sesión" -msgid "You are not authorized." -msgstr "" +msgid "My account" +msgstr "Mi cuenta" -msgid "You are not author in this blog." -msgstr "" +msgid "Log In" +msgstr "Iniciar Sesión" -msgid "{0} mentioned you." -msgstr "" +msgid "Register" +msgstr "Registrar" -msgid "Your comment" -msgstr "" - -msgid "Unknown error" -msgstr "" - -msgid "Invalid name" -msgstr "" - -msgid "A blog with the same name already exists." -msgstr "" - -msgid "Your comment can't be empty" -msgstr "" - -msgid "A post with the same title already exists." -msgstr "" - -msgid "We need an email or a username to identify you" -msgstr "" - -msgid "Your password can't be empty" -msgstr "" - -msgid "Passwords are not matching" -msgstr "" - -msgid "Username can't be empty" -msgstr "" - -msgid "Invalid email" -msgstr "" - -msgid "Password should be at least 8 characters long" -msgstr "" - -msgid "One author in this blog: " -msgid_plural "{0} authors in this blog: " -msgstr[0] "" -msgstr[1] "" - -msgid "Login or use your Fediverse account to interact with this article" -msgstr "" - -msgid "Optional" -msgstr "" - -msgid "One article in this blog" -msgid_plural "{0} articles in this blog" -msgstr[0] "" -msgstr[1] "" - -msgid "Previous page" -msgstr "" - -msgid "Next page" +msgid "About this instance" msgstr "" msgid "Source code" @@ -351,46 +118,75 @@ msgstr "" msgid "Administration" msgstr "" -msgid "Instance settings" +#, fuzzy +msgid "Welcome on {}" +msgstr "Bienvenido(a) a {0}" + +msgid "Latest articles" +msgstr "Últimas publicaciones" + +msgid "Your feed" msgstr "" -msgid "Allow anyone to register" +msgid "Federated feed" msgstr "" -msgid "Short description" +msgid "Local feed" msgstr "" -msgid "Markdown is supported" +msgid "Administration of {0}" +msgstr "" + +msgid "Instances" +msgstr "" + +msgid "Configuration" +msgstr "Configuración" + +msgid "Users" +msgstr "" + +msgid "Unblock" +msgstr "" + +msgid "Block" +msgstr "" + +msgid "Ban" +msgstr "" + +msgid "All the articles of the Fediverse" +msgstr "" + +msgid "Articles from {}" +msgstr "" + +msgid "Nothing to see here yet. Try to subscribe to more people." +msgstr "" + +msgid "Name" +msgstr "Nombre" + +msgid "Optional" +msgstr "" + +msgid "Allow anyone to register here" +msgstr "" + +msgid "Short description - byline" +msgstr "" + +msgid "Markdown syntax is supported" msgstr "" msgid "Long description" msgstr "" -msgid "Default license" +# src/template_utils.rs:144 +msgid "Default article license" msgstr "" -msgid "Save settings" -msgstr "" - -msgid "No comments yet. Be the first to react!" -msgstr "" - -msgid "About this instance" -msgstr "" - -msgid "What is Plume?" -msgstr "" - -msgid "Plume is a decentralized blogging engine." -msgstr "" - -msgid "Authors can manage various blogs from an unique website." -msgstr "" - -msgid "Articles are also visible on other Plume websites, and you can interact with them directly from other platforms like Mastodon." -msgstr "" - -msgid "Create your account" +msgid "Save these settings" msgstr "" msgid "About {0}" @@ -405,158 +201,30 @@ msgstr "" msgid "And connected to {0} other instances" msgstr "" -msgid "Read the detailed rules" -msgstr "" - -msgid "Delete this article" -msgstr "" - -msgid "Delete this blog" -msgstr "" - msgid "Administred by" msgstr "" msgid "Runs Plume {0}" msgstr "" -msgid "Your media" +msgid "Edit your account" +msgstr "Edita tu cuenta" + +msgid "Your Profile" +msgstr "Tu perfil" + +# src/template_utils.rs:144 +msgid "Display name" msgstr "" -msgid "Go to your gallery" -msgstr "" +msgid "Email" +msgstr "Correo electrónico" -msgid "{0}'s avatar'" -msgstr "" +msgid "Summary" +msgstr "Resumen" -msgid "Media details" -msgstr "" - -msgid "Go back to the gallery" -msgstr "" - -msgid "Markdown code" -msgstr "" - -msgid "Copy it in your articles to insert this media." -msgstr "" - -msgid "Use as avatar" -msgstr "" - -msgid "Delete" -msgstr "" - -msgid "Upload" -msgstr "" - -msgid "You don't have any media yet." -msgstr "" - -msgid "Media upload" -msgstr "" - -msgid "Description" -msgstr "" - -msgid "Content warning" -msgstr "" - -msgid "File" -msgstr "" - -msgid "Send" -msgstr "" - -msgid "Sorry, but registrations are closed on this instance. Try to find another one" -msgstr "" - -msgid "Subtitle" -msgstr "" - -msgid "Login to like" -msgstr "" - -msgid "Login to boost" -msgstr "" - -msgid "Your feed" -msgstr "" - -msgid "Federated feed" -msgstr "" - -msgid "Local feed" -msgstr "" - -msgid "Nothing to see here yet. Try to follow more people." -msgstr "" - -msgid "Articles" -msgstr "" - -msgid "All the articles of the Fediverse" -msgstr "" - -msgid "Articles from {0}" -msgstr "" - -msgid "View all" -msgstr "" - -msgid "Articles tagged \"{0}\"" -msgstr "" - -msgid "Edit" -msgstr "" - -msgid "Edit {0}" -msgstr "" - -msgid "Update" -msgstr "" - -msgid "We couldn't find this page." -msgstr "" - -msgid "Invalid CSRF token." -msgstr "" - -msgid "Something is wrong with your CSRF token. Make sure cookies are enabled in you browser, and try reloading this page. If you continue to see this error message, please report it." -msgstr "" - -msgid "Administration of {0}" -msgstr "" - -msgid "Instances" -msgstr "" - -msgid "Unblock" -msgstr "" - -msgid "Block" -msgstr "" - -msgid "Ban" -msgstr "" - -msgid "Useful for visually impaired people and licensing" -msgstr "" - -msgid "Let it empty if there is none" -msgstr "" - -msgid "Draft" -msgstr "" - -msgid "This is a draft, don't publish it yet." -msgstr "" - -msgid "Update or publish" -msgstr "" - -msgid "Your Drafts" -msgstr "" +msgid "Update account" +msgstr "Actualizar cuenta" msgid "Danger zone" msgstr "" @@ -567,16 +235,238 @@ msgstr "" msgid "Delete your account" msgstr "" -msgid "Sorry, but as an admin, you can't leave your instance." +msgid "Sorry, but as an admin, you can't leave your own instance." msgstr "" -msgid "Users" +msgid "Your Dashboard" msgstr "" -msgid "This post isn't published yet." +msgid "Your Blogs" +msgstr "Tus blogs" + +#, fuzzy +msgid "You don't have any blog yet. Create your own, or ask to join one." +msgstr "Aun no tienes un blog. Crea o pide unirte a uno." + +msgid "Start a new blog" +msgstr "Iniciar un nuevo blog" + +msgid "Your Drafts" msgstr "" -msgid "There is currently no article with that tag" +msgid "Your media" +msgstr "" + +msgid "Go to your gallery" +msgstr "" + +msgid "Create your account" +msgstr "" + +msgid "Create an account" +msgstr "Crear una cuenta" + +msgid "Username" +msgstr "Nombre de usuario" + +msgid "Password" +msgstr "Contraseña" + +msgid "Password confirmation" +msgstr "Confirmación de contraseña" + +msgid "" +"Apologies, but registrations are closed on this particular instance. You " +"can, however, find a different one." +msgstr "" + +msgid "Articles" +msgstr "" + +msgid "Subscribers" +msgstr "" + +msgid "Subscriptions" +msgstr "" + +msgid "Atom feed" +msgstr "" + +msgid "Recently boosted" +msgstr "" + +msgid "Admin" +msgstr "" + +msgid "It is you" +msgstr "Eres tú" + +msgid "Edit your profile" +msgstr "Edita tu perfil" + +msgid "Open on {0}" +msgstr "Abrir en {0}" + +msgid "Unsubscribe" +msgstr "" + +msgid "Subscribe" +msgstr "" + +msgid "{0}'s subscriptions'" +msgstr "" + +msgid "{0}'s subscribers" +msgstr "" + +msgid "Respond" +msgstr "Responder" + +msgid "Delete this comment" +msgstr "" + +msgid "What is Plume?" +msgstr "" + +msgid "Plume is a decentralized blogging engine." +msgstr "" + +msgid "Authors can manage various blogs from an unique website." +msgstr "" + +msgid "" +"Articles are also visible on other Plume websites, and you can interact with " +"them directly from other platforms like Mastodon." +msgstr "" + +msgid "Home to {0} people" +msgstr "" + +msgid "Read the detailed rules" +msgstr "" + +msgid "View all" +msgstr "" + +#, fuzzy +msgid "By {0}" +msgstr "Por" + +msgid "Draft" +msgstr "" + +msgid "Your query" +msgstr "" + +msgid "Advanced search" +msgstr "" + +# src/template_utils.rs:185 +msgid "Article title matching these words" +msgstr "" + +msgid "Title" +msgstr "Título" + +# src/template_utils.rs:185 +msgid "Subtitle matching these words" +msgstr "" + +msgid "Subtitle - byline" +msgstr "" + +# src/template_utils.rs:185 +msgid "Content matching these words" +msgstr "" + +#, fuzzy +msgid "Body content" +msgstr "Contenido" + +# src/template_utils.rs:185 +msgid "From this date" +msgstr "" + +# src/template_utils.rs:185 +msgid "To this date" +msgstr "" + +# src/template_utils.rs:185 +msgid "Containing these tags" +msgstr "" + +msgid "Tags" +msgstr "" + +# src/template_utils.rs:185 +msgid "Posted on one of these instances" +msgstr "" + +msgid "Instance domain" +msgstr "" + +# src/template_utils.rs:185 +msgid "Posted by one of these authors" +msgstr "" + +msgid "Authors" +msgstr "" + +# src/template_utils.rs:185 +msgid "Posted on one of these blogs" +msgstr "" + +msgid "Blog title" +msgstr "" + +# src/template_utils.rs:185 +msgid "Written in this language" +msgstr "" + +msgid "Language" +msgstr "" + +#, fuzzy +msgid "Published under this license" +msgstr "Este artículo está bajo la licencia {0}." + +msgid "Article license" +msgstr "" + +msgid "Search result for \"{0}\"" +msgstr "" + +msgid "Search result" +msgstr "" + +msgid "No result for your query" +msgstr "" + +msgid "No more result for your query" +msgstr "" + +msgid "Login" +msgstr "Iniciar Sesión" + +msgid "Username or email" +msgstr "Nombre de usuario o correo electrónico" + +msgid "Subtitle" +msgstr "" + +msgid "Content" +msgstr "Contenido" + +# src/template_utils.rs:144 +msgid "Tags, separated by commas" +msgstr "" + +# src/template_utils.rs:144 +msgid "License" +msgstr "" + +# src/template_utils.rs:148 +msgid "Leave it empty to reserve all rights" msgstr "" msgid "Illustration" @@ -584,3 +474,237 @@ msgstr "" msgid "None" msgstr "" + +msgid "This is a draft, don't publish it yet." +msgstr "" + +msgid "Update" +msgstr "" + +msgid "Update, or publish" +msgstr "" + +msgid "Publish your post" +msgstr "" + +msgid "Written by {0}" +msgstr "Escrito por {0}" + +msgid "Edit" +msgstr "" + +msgid "Delete this article" +msgstr "" + +msgid "All rights reserved." +msgstr "" + +msgid "This article is under the {0} license." +msgstr "Este artículo está bajo la licencia {0}." + +msgid "One like" +msgid_plural "{0} likes" +msgstr[0] "" +msgstr[1] "" + +#, fuzzy +msgid "I don't like this anymore" +msgstr "Ya no me gusta" + +msgid "Add yours" +msgstr "Agregue el suyo" + +msgid "One boost" +msgid_plural "{0} boost" +msgstr[0] "" +msgstr[1] "" + +#, fuzzy +msgid "I don't want to boost this anymore" +msgstr "Ya no me gusta" + +msgid "Boost" +msgstr "" + +msgid "Login or use your Fediverse account to interact with this article" +msgstr "" + +msgid "Comments" +msgstr "Comentários" + +msgid "Content warning" +msgstr "" + +msgid "Your comment" +msgstr "" + +msgid "Submit comment" +msgstr "Enviar comentario" + +msgid "No comments yet. Be the first to react!" +msgstr "" + +msgid "Invalid CSRF token" +msgstr "" + +msgid "" +"Something is wrong with your CSRF token. Make sure cookies are enabled in " +"you browser, and try reloading this page. If you continue to see this error " +"message, please report it." +msgstr "" + +msgid "Page not found" +msgstr "" + +msgid "We couldn't find this page." +msgstr "" + +msgid "The link that led you here may be broken." +msgstr "" + +msgid "The content you sent can't be processed." +msgstr "" + +msgid "Maybe it was too long." +msgstr "" + +msgid "You are not authorized." +msgstr "" + +msgid "Internal server error" +msgstr "" + +msgid "Something broke on our side." +msgstr "" + +msgid "Sorry about that. If you think this is a bug, please report it." +msgstr "" +"Disculpe la molestia. Si cree que esto es un defecto, por favor repórtalo." + +#, fuzzy +msgid "New Blog" +msgstr "Nuevo blog" + +msgid "Create a blog" +msgstr "Crear un blog" + +msgid "Create blog" +msgstr "Crear el blog" + +msgid "There's one author on this blog: " +msgid_plural "There are {0} authors on this blog: " +msgstr[0] "" +msgstr[1] "" + +msgid "There's one article on this blog" +msgid_plural "There are {0} articles on this blog" +msgstr[0] "" +msgstr[1] "" + +#, fuzzy +msgid "No posts to see here yet." +msgstr "No hay publicaciones para ver aquí ahora." + +msgid "New article" +msgstr "Nueva publicación" + +msgid "Be very careful, any action taken here can't be reversed." +msgstr "" + +msgid "Permanently delete this blog" +msgstr "" + +msgid "Articles tagged \"{0}\"" +msgstr "" + +msgid "There are currently no articles with such a tag" +msgstr "" + +msgid "Upload" +msgstr "" + +msgid "You don't have any media yet." +msgstr "" + +msgid "Delete" +msgstr "" + +msgid "Media upload" +msgstr "" + +msgid "Description" +msgstr "" + +msgid "Useful for visually impaired people, as well as licensing information" +msgstr "" + +msgid "Leave it empty, if none is needed" +msgstr "" + +msgid "File" +msgstr "" + +msgid "Send" +msgstr "" + +msgid "Media details" +msgstr "" + +msgid "Go back to the gallery" +msgstr "" + +msgid "Markdown syntax" +msgstr "" + +msgid "Copy it into your articles, to insert this media:" +msgstr "" + +msgid "Use as avatar" +msgstr "" + +#~ msgid "Comment \"{0}\"" +#~ msgstr "Comentario \"{0}\"" + +#~ msgid "Configure your instance" +#~ msgstr "Configure su instancia" + +#~ msgid "Let's go!" +#~ msgstr "Vamos!" + +#~ msgid "Comment" +#~ msgstr "Comentar" + +#~ msgid "Create a post" +#~ msgstr "Crear una publicación" + +#~ msgid "Publish" +#~ msgstr "Publicar" + +#~ msgid "Follow" +#~ msgstr "Seguir" + +#~ msgid "Unfollow" +#~ msgstr "Dejar de seguir" + +#~ msgid "One follower" +#~ msgid_plural "{0} followers" +#~ msgstr[0] "Un seguidor" +#~ msgstr[1] "{0} seguidores" + +#~ msgid "{0}'s followers" +#~ msgstr "Los seguidores de {0}" + +#~ msgid "Followers" +#~ msgstr "Seguidores" + +#~ msgid "New Account" +#~ msgstr "Nueva cuenta" + +#~ msgid "Create account" +#~ msgstr "Crea una cuenta" + +#~ msgid "You need to be logged in order to post a comment" +#~ msgstr "Necesitas iniciar sesión para publicar un comentario" + +#~ msgid "{0} started following you" +#~ msgstr "{0} comenzó a seguirte" diff --git a/po/plume/fr.po b/po/plume/fr.po index 19a2fb41..0542d8d0 100644 --- a/po/plume/fr.po +++ b/po/plume/fr.po @@ -21,7 +21,7 @@ msgid "{0} commented your article." msgstr "{0} a commenté votre article" # src/template_utils.rs:35 -msgid "{0} is now following you." +msgid "{0} is subscribed to you." msgstr "" #, fuzzy @@ -81,7 +81,7 @@ msgid "You need to be logged in order to access your dashboard" msgstr "Vous devez vous connecter pour accéder à votre tableau de bord" #, fuzzy -msgid "You need to be logged in order to follow someone" +msgid "You need to be logged in order to subscribe to someone" msgstr "Vous devez vous connecter pour suivre quelqu’un" #, fuzzy @@ -173,7 +173,7 @@ msgid "Articles from {}" msgstr "Articles de {0}" #, fuzzy -msgid "Nothing to see here yet. Try to follow more people." +msgid "Nothing to see here yet. Try to subscribe to more people." msgstr "Rien par ici pour le moment. Essayez de suivre plus de monde." msgid "Name" @@ -313,8 +313,12 @@ msgstr "" msgid "Articles" msgstr "Articles" -msgid "Followers" -msgstr "Abonné⋅e⋅s" +msgid "Subscribers" +msgstr "" + +#, fuzzy +msgid "Subscriptions" +msgstr "Description" #, fuzzy msgid "Atom feed" @@ -336,15 +340,19 @@ msgstr "Modifier votre profil" msgid "Open on {0}" msgstr "" +msgid "Unsubscribe" +msgstr "" + +msgid "Subscribe" +msgstr "" + #, fuzzy -msgid "Unfollow" -msgstr "S’abonner" +msgid "{0}'s subscriptions'" +msgstr "Description" -msgid "Follow" -msgstr "S’abonner" - -msgid "{0}'s followers" -msgstr "Abonné⋅e⋅s de {0}" +#, fuzzy +msgid "{0}'s subscribers" +msgstr "Description" msgid "Respond" msgstr "Répondre" @@ -718,6 +726,25 @@ msgstr "Copiez-le dans vos articles pour insérer ce média." msgid "Use as avatar" msgstr "Utiliser comme avatar" +#~ msgid "{0}'s followers" +#~ msgstr "Abonné⋅e⋅s de {0}" + +#~ msgid "People {0} follows" +#~ msgstr "Personnes suivies par {0}" + +#~ msgid "Followers" +#~ msgstr "Abonné⋅e⋅s" + +#~ msgid "Followed" +#~ msgstr "Suivi⋅e⋅s" + +#, fuzzy +#~ msgid "Unfollow" +#~ msgstr "S’abonner" + +#~ msgid "Follow" +#~ msgstr "S’abonner" + #, fuzzy #~ msgid "No articles to see here yet." #~ msgstr "Aucun article pour le moment." diff --git a/po/plume/gl.po b/po/plume/gl.po index 66781d5d..b12ebcd4 100644 --- a/po/plume/gl.po +++ b/po/plume/gl.po @@ -17,7 +17,7 @@ msgid "{0} commented your article." msgstr "{0} comentou o seu artigo" # src/template_utils.rs:35 -msgid "{0} is now following you." +msgid "{0} is subscribed to you." msgstr "" #, fuzzy @@ -78,7 +78,7 @@ msgid "You need to be logged in order to access your dashboard" msgstr "Debe estar conectada para acceder ao seu taboleiro" #, fuzzy -msgid "You need to be logged in order to follow someone" +msgid "You need to be logged in order to subscribe to someone" msgstr "Debe estar conectada para seguir a alguén" #, fuzzy @@ -174,7 +174,7 @@ msgid "Articles from {}" msgstr "Artigos desde {0}" #, fuzzy -msgid "Nothing to see here yet. Try to follow more people." +msgid "Nothing to see here yet. Try to subscribe to more people." msgstr "Nada que ler por aquí. Intente seguir a máis xente." msgid "Name" @@ -309,8 +309,12 @@ msgstr "" msgid "Articles" msgstr "Artigos" -msgid "Followers" -msgstr "Seguidoras" +msgid "Subscribers" +msgstr "" + +#, fuzzy +msgid "Subscriptions" +msgstr "Descrición" #, fuzzy msgid "Atom feed" @@ -332,16 +336,19 @@ msgstr "Edite o seu perfil" msgid "Open on {0}" msgstr "" -#, fuzzy -msgid "Unfollow" -msgstr "Seguir" +msgid "Unsubscribe" +msgstr "" -msgid "Follow" -msgstr "Seguir" +msgid "Subscribe" +msgstr "" #, fuzzy -msgid "{0}'s followers" -msgstr "Unha seguidora" +msgid "{0}'s subscriptions'" +msgstr "Descrición" + +#, fuzzy +msgid "{0}'s subscribers" +msgstr "Descrición" msgid "Respond" msgstr "Respostar" @@ -715,6 +722,28 @@ msgstr "Copie para incrustar este contido nos seus artigos" msgid "Use as avatar" msgstr "Utilizar como avatar" +#, fuzzy +#~ msgid "{0}'s followers" +#~ msgstr "Unha seguidora" + +#, fuzzy +#~ msgid "People {0} follows" +#~ msgstr "Unha seguidora" + +#~ msgid "Followers" +#~ msgstr "Seguidoras" + +#, fuzzy +#~ msgid "Followed" +#~ msgstr "Seguir" + +#, fuzzy +#~ msgid "Unfollow" +#~ msgstr "Seguir" + +#~ msgid "Follow" +#~ msgstr "Seguir" + #, fuzzy #~ msgid "No articles to see here yet." #~ msgstr "Aínda non hai entradas publicadas" diff --git a/po/plume/it.po b/po/plume/it.po index da493121..4353996d 100644 --- a/po/plume/it.po +++ b/po/plume/it.po @@ -17,7 +17,7 @@ msgid "{0} commented your article." msgstr "{0} ha commentato il tuo articolo" # src/template_utils.rs:35 -msgid "{0} is now following you." +msgid "{0} is subscribed to you." msgstr "" #, fuzzy @@ -78,7 +78,7 @@ msgid "You need to be logged in order to access your dashboard" msgstr "Devi effettuare l'accesso per accedere al tuo pannello" #, fuzzy -msgid "You need to be logged in order to follow someone" +msgid "You need to be logged in order to subscribe to someone" msgstr "Devi effettuare l'accesso per seguire qualcuno" #, fuzzy @@ -174,7 +174,7 @@ msgid "Articles from {}" msgstr "Articoli da {0}}" #, fuzzy -msgid "Nothing to see here yet. Try to follow more people." +msgid "Nothing to see here yet. Try to subscribe to more people." msgstr "Non c'è niente da mostrare qui. Prova a seguire più persone." msgid "Name" @@ -312,8 +312,12 @@ msgstr "" msgid "Articles" msgstr "Articoli" -msgid "Followers" -msgstr "Seguaci" +msgid "Subscribers" +msgstr "" + +#, fuzzy +msgid "Subscriptions" +msgstr "Descrizione" #, fuzzy msgid "Atom feed" @@ -335,16 +339,19 @@ msgstr "Modifica il tuo profilo" msgid "Open on {0}" msgstr "" -#, fuzzy -msgid "Unfollow" -msgstr "Segui" +msgid "Unsubscribe" +msgstr "" -msgid "Follow" -msgstr "Segui" +msgid "Subscribe" +msgstr "" #, fuzzy -msgid "{0}'s followers" -msgstr "Uno ti segue" +msgid "{0}'s subscriptions'" +msgstr "Descrizione" + +#, fuzzy +msgid "{0}'s subscribers" +msgstr "Descrizione" msgid "Respond" msgstr "Rispondi" @@ -722,6 +729,28 @@ msgstr "Copialo nei tuoi articoli per inserire questo media." msgid "Use as avatar" msgstr "Usa come avatar" +#, fuzzy +#~ msgid "{0}'s followers" +#~ msgstr "Uno ti segue" + +#, fuzzy +#~ msgid "People {0} follows" +#~ msgstr "Uno ti segue" + +#~ msgid "Followers" +#~ msgstr "Seguaci" + +#, fuzzy +#~ msgid "Followed" +#~ msgstr "Segui" + +#, fuzzy +#~ msgid "Unfollow" +#~ msgstr "Segui" + +#~ msgid "Follow" +#~ msgstr "Segui" + #, fuzzy #~ msgid "No articles to see here yet." #~ msgstr "Nessun post da mostrare qui." diff --git a/po/plume/ja.po b/po/plume/ja.po index ca845dee..fff56f0a 100644 --- a/po/plume/ja.po +++ b/po/plume/ja.po @@ -18,9 +18,9 @@ msgstr "" msgid "{0} commented your article." msgstr "{{ data }} があなたの記事にコメントしました" -#, fuzzy -msgid "{0} is now following you." -msgstr "{{ user }} はあなたをフォローしています。" +# src/template_utils.rs:35 +msgid "{0} is subscribed to you." +msgstr "" #, fuzzy msgid "{0} liked your article." @@ -74,7 +74,8 @@ msgstr "投稿をいいねするにはログインする必要があります" msgid "You need to be logged in order to access your dashboard" msgstr "ダッシュボードにアクセスするにはログインする必要があります" -msgid "You need to be logged in order to follow someone" +#, fuzzy +msgid "You need to be logged in order to subscribe to someone" msgstr "他の人をフォローするにはログインする必要があります" msgid "You need to be logged in order to edit your profile" @@ -163,7 +164,8 @@ msgstr "Fediverse のすべての記事" msgid "Articles from {}" msgstr "{{ instance.name }} の記事" -msgid "Nothing to see here yet. Try to follow more people." +#, fuzzy +msgid "Nothing to see here yet. Try to subscribe to more people." msgstr "" "ここにはまだ表示できるものがありません。他の人をもっとフォローしてみてくださ" "い。" @@ -298,8 +300,12 @@ msgstr "" msgid "Articles" msgstr "記事" -msgid "Followers" -msgstr "フォロワー" +msgid "Subscribers" +msgstr "" + +#, fuzzy +msgid "Subscriptions" +msgstr "説明" #, fuzzy msgid "Atom feed" @@ -320,15 +326,19 @@ msgstr "自分のプロフィールを編集" msgid "Open on {0}" msgstr "" -msgid "Unfollow" -msgstr "フォロー解除" +msgid "Unsubscribe" +msgstr "" -msgid "Follow" -msgstr "フォロー" +msgid "Subscribe" +msgstr "" #, fuzzy -msgid "{0}'s followers" -msgstr "{{ count }} フォロワー" +msgid "{0}'s subscriptions'" +msgstr "説明" + +#, fuzzy +msgid "{0}'s subscribers" +msgstr "説明" msgid "Respond" msgstr "返信" @@ -693,6 +703,30 @@ msgstr "このメディアを記事に挿入するには、自分の記事にコ msgid "Use as avatar" msgstr "アバターとして使う" +#~ msgid "{0}'s followers" +#~ msgstr "{{ count }} フォロワー" + +#, fuzzy +#~ msgid "{0} is now following you." +#~ msgstr "{{ user }} はあなたをフォローしています。" + +#, fuzzy +#~ msgid "People {0} follows" +#~ msgstr "{0} さんのフォロワー" + +#~ msgid "Followers" +#~ msgstr "フォロワー" + +#, fuzzy +#~ msgid "Followed" +#~ msgstr "フォロー" + +#~ msgid "Unfollow" +#~ msgstr "フォロー解除" + +#~ msgid "Follow" +#~ msgstr "フォロー" + #, fuzzy #~ msgid "Comment \"{0}\"" #~ msgstr "\"{{ post }}\" にコメント" diff --git a/po/plume/nb.po b/po/plume/nb.po index 944a6bdb..102fd35f 100644 --- a/po/plume/nb.po +++ b/po/plume/nb.po @@ -18,9 +18,9 @@ msgstr "" msgid "{0} commented your article." msgstr "{0} la inn en kommentar til artikkelen din" -#, fuzzy -msgid "{0} is now following you." -msgstr "{0} har begynt å følge deg" +# src/template_utils.rs:35 +msgid "{0} is subscribed to you." +msgstr "" #, fuzzy msgid "{0} liked your article." @@ -81,7 +81,7 @@ msgid "You need to be logged in order to access your dashboard" msgstr "Du må være logget inn for å redigere profilen din" #, fuzzy -msgid "You need to be logged in order to follow someone" +msgid "You need to be logged in order to subscribe to someone" msgstr "Du må være logget inn for å følge noen" #, fuzzy @@ -177,7 +177,7 @@ msgstr "" msgid "Articles from {}" msgstr "Om {0}" -msgid "Nothing to see here yet. Try to follow more people." +msgid "Nothing to see here yet. Try to subscribe to more people." msgstr "" # src/template_utils.rs:144 @@ -314,8 +314,12 @@ msgstr "" msgid "Articles" msgstr "artikler" -msgid "Followers" -msgstr "Følgere" +msgid "Subscribers" +msgstr "" + +#, fuzzy +msgid "Subscriptions" +msgstr "Lang beskrivelse" #, fuzzy msgid "Atom feed" @@ -338,15 +342,19 @@ msgstr "Din profil" msgid "Open on {0}" msgstr "" -msgid "Unfollow" -msgstr "Slutt å følge" +msgid "Unsubscribe" +msgstr "" -msgid "Follow" -msgstr "Følg" +msgid "Subscribe" +msgstr "" #, fuzzy -msgid "{0}'s followers" -msgstr "Én følger" +msgid "{0}'s subscriptions'" +msgstr "Lang beskrivelse" + +#, fuzzy +msgid "{0}'s subscribers" +msgstr "Lang beskrivelse" msgid "Respond" msgstr "Svar" @@ -732,6 +740,31 @@ msgstr "" msgid "Use as avatar" msgstr "" +#, fuzzy +#~ msgid "{0}'s followers" +#~ msgstr "Én følger" + +#, fuzzy +#~ msgid "{0} is now following you." +#~ msgstr "{0} har begynt å følge deg" + +#, fuzzy +#~ msgid "People {0} follows" +#~ msgstr "Én følger" + +#~ msgid "Followers" +#~ msgstr "Følgere" + +#, fuzzy +#~ msgid "Followed" +#~ msgstr "Følg" + +#~ msgid "Unfollow" +#~ msgstr "Slutt å følge" + +#~ msgid "Follow" +#~ msgstr "Følg" + #, fuzzy #~ msgid "No articles to see here yet." #~ msgstr "Ingen innlegg å vise enda." diff --git a/po/plume/pl.po b/po/plume/pl.po index f319f8f9..df49c2b7 100644 --- a/po/plume/pl.po +++ b/po/plume/pl.po @@ -18,8 +18,8 @@ msgid "{0} commented your article." msgstr "{0} skomentował(a) Twój artykuł." # src/template_utils.rs:35 -msgid "{0} is now following you." -msgstr "{0} zaczął(-eła) Cię obserwować." +msgid "{0} is subscribed to you." +msgstr "" msgid "{0} liked your article." msgstr "{0} polubił(a) Twój artykuł." @@ -66,7 +66,8 @@ msgstr "Musisz się zalogować, aby udostępnić wpis" msgid "You need to be logged in order to access your dashboard" msgstr "Musisz się zalogować, aby uzyskać dostęp do panelu" -msgid "You need to be logged in order to follow someone" +#, fuzzy +msgid "You need to be logged in order to subscribe to someone" msgstr "Musisz się zalogować, aby zacząć obserwować innych" msgid "You need to be logged in order to edit your profile" @@ -153,7 +154,8 @@ msgstr "Wszystkie artykuły w Fediwersum" msgid "Articles from {}" msgstr "Artykuły z {}" -msgid "Nothing to see here yet. Try to follow more people." +#, fuzzy +msgid "Nothing to see here yet. Try to subscribe to more people." msgstr "Nie ma tutaj niczego. Spróbuj zacząć śledzić więcej osób." msgid "Name" @@ -276,9 +278,14 @@ msgstr "" msgid "Articles" msgstr "Artykuły" -msgid "Followers" -msgstr "Śledzący" +msgid "Subscribers" +msgstr "" +#, fuzzy +msgid "Subscriptions" +msgstr "Opis" + +#, fuzzy msgid "Atom feed" msgstr "Strumień Atom" @@ -297,14 +304,19 @@ msgstr "Edytuj swój profil" msgid "Open on {0}" msgstr "Otwórz w {0}" -msgid "Unfollow" -msgstr "Przestań obserwować" +msgid "Unsubscribe" +msgstr "" -msgid "Follow" -msgstr "Obserwuj" +msgid "Subscribe" +msgstr "" -msgid "{0}'s followers" -msgstr "Obserwujący {0}" +#, fuzzy +msgid "{0}'s subscriptions'" +msgstr "Opis" + +#, fuzzy +msgid "{0}'s subscribers" +msgstr "Opis" msgid "Respond" msgstr "Odpowiedz" @@ -658,6 +670,30 @@ msgstr "Skopiuj do swoich artykułów, aby wstawić tę zawartość multimedialn msgid "Use as avatar" msgstr "Użyj jako awataru" +#~ msgid "{0}'s followers" +#~ msgstr "Obserwujący {0}" + +# src/template_utils.rs:35 +#~ msgid "{0} is now following you." +#~ msgstr "{0} zaczął(-eła) Cię obserwować." + +#, fuzzy +#~ msgid "People {0} follows" +#~ msgstr "Obserwujący {0}" + +#~ msgid "Followers" +#~ msgstr "Śledzący" + +#, fuzzy +#~ msgid "Followed" +#~ msgstr "Śledzący" + +#~ msgid "Unfollow" +#~ msgstr "Przestań obserwować" + +#~ msgid "Follow" +#~ msgstr "Obserwuj" + #, fuzzy #~ msgid "No articles to see here yet." #~ msgstr "Brak wpisów do wyświetlenia." diff --git a/po/plume/plume.pot b/po/plume/plume.pot index 86956e1a..c359ae06 100644 --- a/po/plume/plume.pot +++ b/po/plume/plume.pot @@ -17,7 +17,7 @@ msgid "{0} commented your article." msgstr "" # src/template_utils.rs:35 -msgid "{0} is now following you." +msgid "{0} is subscribed to you." msgstr "" # src/template_utils.rs:36 @@ -81,10 +81,10 @@ msgid "You need to be logged in order to access your dashboard" msgstr "" # src/routes/user.rs:164 -msgid "You need to be logged in order to follow someone" +msgid "You need to be logged in order to subscribe to someone" msgstr "" -# src/routes/user.rs:227 +# src/routes/user.rs:245 msgid "You need to be logged in order to edit your profile" msgstr "" @@ -169,7 +169,7 @@ msgstr "" msgid "Articles from {}" msgstr "" -msgid "Nothing to see here yet. Try to follow more people." +msgid "Nothing to see here yet. Try to subscribe to more people." msgstr "" # src/template_utils.rs:144 @@ -295,7 +295,10 @@ msgstr "" msgid "Articles" msgstr "" -msgid "Followers" +msgid "Subscribers" +msgstr "" + +msgid "Subscriptions" msgstr "" msgid "Atom feed" @@ -316,13 +319,16 @@ msgstr "" msgid "Open on {0}" msgstr "" -msgid "Unfollow" +msgid "Unsubscribe" msgstr "" -msgid "Follow" +msgid "Subscribe" msgstr "" -msgid "{0}'s followers" +msgid "{0}'s subscriptions'" +msgstr "" + +msgid "{0}'s subscribers" msgstr "" msgid "Respond" diff --git a/po/plume/pt.po b/po/plume/pt.po index 5b6b831d..ef72d65f 100644 --- a/po/plume/pt.po +++ b/po/plume/pt.po @@ -18,9 +18,9 @@ msgstr "" msgid "{0} commented your article." msgstr "{0} comentou o seu artigo" -#, fuzzy -msgid "{0} is now following you." -msgstr "{0} começou a seguir você" +# src/template_utils.rs:35 +msgid "{0} is subscribed to you." +msgstr "" #, fuzzy msgid "{0} liked your article." @@ -72,7 +72,8 @@ msgstr "Você precisa estar logado para gostar de um post" msgid "You need to be logged in order to access your dashboard" msgstr "Você precisa estar autenticado para acessar seu painel de controle" -msgid "You need to be logged in order to follow someone" +#, fuzzy +msgid "You need to be logged in order to subscribe to someone" msgstr "Você precisa estar autenticado para poder seguir alguém" msgid "You need to be logged in order to edit your profile" @@ -161,7 +162,8 @@ msgstr "Todos os artigos do Fediverse" msgid "Articles from {}" msgstr "Artigos de {0}" -msgid "Nothing to see here yet. Try to follow more people." +#, fuzzy +msgid "Nothing to see here yet. Try to subscribe to more people." msgstr "Ainda não há nada para ver aqui. Tente seguir mais pessoas." msgid "Name" @@ -292,8 +294,12 @@ msgstr "" msgid "Articles" msgstr "Artigos" -msgid "Followers" -msgstr "Seguidores" +msgid "Subscribers" +msgstr "" + +#, fuzzy +msgid "Subscriptions" +msgstr "Descrição" #, fuzzy msgid "Atom feed" @@ -314,14 +320,19 @@ msgstr "Editar o seu perfil" msgid "Open on {0}" msgstr "Abrir em {0}" -msgid "Unfollow" -msgstr "Não Seguir" +msgid "Unsubscribe" +msgstr "" -msgid "Follow" -msgstr "Seguir" +msgid "Subscribe" +msgstr "" -msgid "{0}'s followers" -msgstr "Seguidores de {0}" +#, fuzzy +msgid "{0}'s subscriptions'" +msgstr "Descrição" + +#, fuzzy +msgid "{0}'s subscribers" +msgstr "Descrição" msgid "Respond" msgstr "Responder" @@ -683,6 +694,26 @@ msgstr "Copie-o em seus artigos para inserir esta mídia." msgid "Use as avatar" msgstr "Utilizar como avatar" +#~ msgid "{0}'s followers" +#~ msgstr "Seguidores de {0}" + +#, fuzzy +#~ msgid "{0} is now following you." +#~ msgstr "{0} começou a seguir você" + +#, fuzzy +#~ msgid "People {0} follows" +#~ msgstr "Seguidores de {0}" + +#~ msgid "Followers" +#~ msgstr "Seguidores" + +#~ msgid "Unfollow" +#~ msgstr "Não Seguir" + +#~ msgid "Follow" +#~ msgstr "Seguir" + #~ msgid "Comment \"{0}\"" #~ msgstr "Comentário \"{0}\"" diff --git a/po/plume/ru.po b/po/plume/ru.po index 762a405c..66fbf9f5 100644 --- a/po/plume/ru.po +++ b/po/plume/ru.po @@ -19,7 +19,7 @@ msgid "{0} commented your article." msgstr "{0} прокомментировал(а) вашу статью" # src/template_utils.rs:35 -msgid "{0} is now following you." +msgid "{0} is subscribed to you." msgstr "" #, fuzzy @@ -80,7 +80,7 @@ msgid "You need to be logged in order to access your dashboard" msgstr "Вы должны войти чтобы получить доступ к вашей панели управления" #, fuzzy -msgid "You need to be logged in order to follow someone" +msgid "You need to be logged in order to subscribe to someone" msgstr "Вы должны войти чтобы подписаться на кого-либо" #, fuzzy @@ -178,7 +178,7 @@ msgid "Articles from {}" msgstr "Статьи с {0}" #, fuzzy -msgid "Nothing to see here yet. Try to follow more people." +msgid "Nothing to see here yet. Try to subscribe to more people." msgstr "" "Пока что здесь ничего нет. Попробуйте подписаться на большее число людей." @@ -316,8 +316,12 @@ msgstr "" msgid "Articles" msgstr "Статьи" -msgid "Followers" -msgstr "Подписчики" +msgid "Subscribers" +msgstr "" + +#, fuzzy +msgid "Subscriptions" +msgstr "Описание" #, fuzzy msgid "Atom feed" @@ -339,16 +343,19 @@ msgstr "Редактировать ваш профиль" msgid "Open on {0}" msgstr "" -#, fuzzy -msgid "Unfollow" -msgstr "Подписаться" +msgid "Unsubscribe" +msgstr "" -msgid "Follow" -msgstr "Подписаться" +msgid "Subscribe" +msgstr "" #, fuzzy -msgid "{0}'s followers" -msgstr "Один подписчик" +msgid "{0}'s subscriptions'" +msgstr "Описание" + +#, fuzzy +msgid "{0}'s subscribers" +msgstr "Описание" msgid "Respond" msgstr "Ответить" @@ -727,6 +734,28 @@ msgstr "" msgid "Use as avatar" msgstr "Использовать как аватар" +#, fuzzy +#~ msgid "{0}'s followers" +#~ msgstr "Один подписчик" + +#, fuzzy +#~ msgid "People {0} follows" +#~ msgstr "Один подписчик" + +#~ msgid "Followers" +#~ msgstr "Подписчики" + +#, fuzzy +#~ msgid "Followed" +#~ msgstr "Подписаться" + +#, fuzzy +#~ msgid "Unfollow" +#~ msgstr "Подписаться" + +#~ msgid "Follow" +#~ msgstr "Подписаться" + #, fuzzy #~ msgid "No articles to see here yet." #~ msgstr "Здесь пока нет постов." diff --git a/src/main.rs b/src/main.rs index 1e6627db..15e7df5c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -54,7 +54,7 @@ use std::process::exit; use std::sync::Arc; use std::time::Duration; -init_i18n!("plume", ar, de, en, fr, gl, it, ja, nb, pl, pt, ru); +init_i18n!("plume", ar, de, en, es, fr, gl, it, ja, nb, pl, pt, ru); mod api; mod inbox; @@ -187,6 +187,7 @@ Then try to restart Plume. routes::user::dashboard, routes::user::dashboard_auth, routes::user::followers, + routes::user::followed, routes::user::edit, routes::user::edit_auth, routes::user::update, diff --git a/src/routes/instance.rs b/src/routes/instance.rs index 37149478..8fcd26ba 100644 --- a/src/routes/instance.rs +++ b/src/routes/instance.rs @@ -28,7 +28,7 @@ pub fn index(conn: DbConn, user: Option, intl: I18n) -> Result>(); in_feed.push(user.id); Post::user_feed_page(&*conn, in_feed, Page::default().limits()).ok() @@ -62,7 +62,7 @@ pub fn local(conn: DbConn, user: Option, page: Option, intl: I18n) - #[get("/feed?")] pub fn feed(conn: DbConn, user: User, page: Option, intl: I18n) -> Result { let page = page.unwrap_or_default(); - let followed = user.get_following(&*conn)?; + let followed = user.get_followed(&*conn)?; let mut in_feed = followed.into_iter().map(|u| u.id).collect::>(); in_feed.push(user.id); let articles = Post::user_feed_page(&*conn, in_feed, page.limits())?; diff --git a/src/routes/user.rs b/src/routes/user.rs index f44e6b48..f0350a41 100644 --- a/src/routes/user.rs +++ b/src/routes/user.rs @@ -161,7 +161,7 @@ pub fn follow(name: String, conn: DbConn, user: User, worker: Worker) -> Result< #[post("/@//follow", rank = 2)] pub fn follow_auth(name: String, i18n: I18n) -> Flash { utils::requires_login( - &i18n!(i18n.catalog, "You need to be logged in order to follow someone"), + &i18n!(i18n.catalog, "You need to be logged in order to subscribe to someone"), uri!(follow: name = name), ) } @@ -184,6 +184,24 @@ pub fn followers(name: String, conn: DbConn, account: Option, page: Option ))) } +#[get("/@//followed?", rank = 2)] +pub fn followed(name: String, conn: DbConn, account: Option, page: Option, intl: I18n) -> Result { + let page = page.unwrap_or_default(); + let user = User::find_by_fqn(&*conn, &name)?; + let followed_count = user.count_followed(&*conn)?; + + Ok(render!(users::followed( + &(&*conn, &intl.catalog, account.clone()), + user.clone(), + account.and_then(|x| x.is_following(&*conn, user.id).ok()).unwrap_or(false), + user.instance_id != Instance::get_local(&*conn)?.id, + user.get_instance(&*conn)?.public_domain, + user.get_followed_page(&*conn, page.limits())?, + page.0, + Page::total(followed_count as i32) + ))) +} + #[get("/@/", rank = 1)] pub fn activity_details( name: String, diff --git a/src/template_utils.rs b/src/template_utils.rs index 14512d33..9ea0e68b 100644 --- a/src/template_utils.rs +++ b/src/template_utils.rs @@ -32,7 +32,7 @@ pub fn translate_notification(ctx: BaseContext, notif: Notification) -> String { let name = notif.get_actor(ctx.0).unwrap().name(ctx.0); match notif.kind.as_ref() { notification_kind::COMMENT => i18n!(ctx.1, "{0} commented your article."; &name), - notification_kind::FOLLOW => i18n!(ctx.1, "{0} is now following you."; &name), + notification_kind::FOLLOW => i18n!(ctx.1, "{0} is subscribed to you."; &name), notification_kind::LIKE => i18n!(ctx.1, "{0} liked your article."; &name), notification_kind::MENTION => i18n!(ctx.1, "{0} mentioned you."; &name), notification_kind::RESHARE => i18n!(ctx.1, "{0} boosted your article."; &name), diff --git a/templates/instance/feed.rs.html b/templates/instance/feed.rs.html index bd131795..32af52d1 100644 --- a/templates/instance/feed.rs.html +++ b/templates/instance/feed.rs.html @@ -22,7 +22,7 @@ } } else { -

@i18n!(ctx.1, "Nothing to see here yet. Try to follow more people.")

+

@i18n!(ctx.1, "Nothing to see here yet. Try to subscribe to more people.")

} @paginate(ctx.1, page, n_pages) }) diff --git a/templates/posts/details.rs.html b/templates/posts/details.rs.html index dc4a94f7..c69d3780 100644 --- a/templates/posts/details.rs.html +++ b/templates/posts/details.rs.html @@ -80,7 +80,7 @@ @if !ctx.2.as_ref().map(|u| u.id == author.id).unwrap_or(false) {
- +
} diff --git a/templates/users/details.rs.html b/templates/users/details.rs.html index 04641587..5c2052ba 100644 --- a/templates/users/details.rs.html +++ b/templates/users/details.rs.html @@ -11,7 +11,8 @@ @tabs(&[ (&uri!(user::details: name= user.get_fqn(ctx.0)).to_string(), i18n!(ctx.1, "Articles"), true), - (&uri!(user::followers: name = user.get_fqn(ctx.0), page = _).to_string(), i18n!(ctx.1, "Followers"), false) + (&uri!(user::followers: name = user.get_fqn(ctx.0), page = _).to_string(), i18n!(ctx.1, "Subscribers"), false), + (&uri!(user::followed: name = user.get_fqn(ctx.0), page = _).to_string(), i18n!(ctx.1, "Subscriptions"), false) ]) @if !recents.is_empty() { diff --git a/templates/users/followed.rs.html b/templates/users/followed.rs.html new file mode 100644 index 00000000..bf328c4b --- /dev/null +++ b/templates/users/followed.rs.html @@ -0,0 +1,26 @@ +@use templates::{base, users::header}; +@use template_utils::*; +@use plume_models::users::User; +@use routes::*; + +@(ctx: BaseContext, user: User, follows: bool, is_remote: bool, remote_url: String, followed: Vec, page: i32, n_pages: i32) + +@:base(ctx, i18n!(ctx.1, "{0}'s subscriptions'"; user.name(ctx.0)), {}, {}, { + @:header(ctx, &user, follows, is_remote, remote_url) + + @tabs(&[ + (&uri!(user::details: name= user.get_fqn(ctx.0)).to_string(), i18n!(ctx.1, "Articles"), true), + (&uri!(user::followers: name = user.get_fqn(ctx.0), page = _).to_string(), i18n!(ctx.1, "Subscribers"), false), + (&uri!(user::followed: name = user.get_fqn(ctx.0), page = _).to_string(), i18n!(ctx.1, "Subscriptions"), false) + ]) + +
+ @for follow in followed { +
+

@follow.name(ctx.0) @format!("@{}", follow.get_fqn(ctx.0))

+

@Html(follow.summary)

+
+ } +
+ @paginate(ctx.1, page, n_pages) +}) diff --git a/templates/users/followers.rs.html b/templates/users/followers.rs.html index 96790e69..10b697e4 100644 --- a/templates/users/followers.rs.html +++ b/templates/users/followers.rs.html @@ -5,12 +5,13 @@ @(ctx: BaseContext, user: User, follows: bool, is_remote: bool, remote_url: String, followers: Vec, page: i32, n_pages: i32) -@:base(ctx, i18n!(ctx.1, "{0}'s followers"; user.name(ctx.0)), {}, {}, { +@:base(ctx, i18n!(ctx.1, "{0}'s subscribers"; user.name(ctx.0)), {}, {}, { @:header(ctx, &user, follows, is_remote, remote_url) @tabs(&[ - (&uri!(user::details: name= user.get_fqn(ctx.0)).to_string(), i18n!(ctx.1, "Articles"), false), - (&uri!(user::followers: name = user.get_fqn(ctx.0), page = _).to_string(), i18n!(ctx.1, "Followers"), true) + (&uri!(user::details: name= user.get_fqn(ctx.0)).to_string(), i18n!(ctx.1, "Articles"), true), + (&uri!(user::followers: name = user.get_fqn(ctx.0), page = _).to_string(), i18n!(ctx.1, "Subscribers"), false), + (&uri!(user::followed: name = user.get_fqn(ctx.0), page = _).to_string(), i18n!(ctx.1, "Subscriptions"), false) ])
diff --git a/templates/users/header.rs.html b/templates/users/header.rs.html index 5bf8ddb3..de2971cf 100644 --- a/templates/users/header.rs.html +++ b/templates/users/header.rs.html @@ -35,9 +35,9 @@ @if ctx.2.clone().map(|u| u.id != user.id).unwrap_or(false) {
@if follows { - + } else { - + }
}