Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into develop

This commit is contained in:
sadposter 2021-12-30 21:09:22 +00:00
commit dfb376cbd4
26 changed files with 4 additions and 27 deletions

View file

@ -14,7 +14,7 @@ export default {
if (this.inProgress || this.relationship.following) { if (this.inProgress || this.relationship.following) {
return this.$t('user_card.follow_unfollow') return this.$t('user_card.follow_unfollow')
} else if (this.relationship.requested) { } else if (this.relationship.requested) {
return this.$t('user_card.follow_again') return this.$t('user_card.follow_cancel')
} else { } else {
return this.$t('user_card.follow') return this.$t('user_card.follow')
} }
@ -33,7 +33,7 @@ export default {
}, },
methods: { methods: {
onClick () { onClick () {
this.relationship.following ? this.unfollow() : this.follow() this.relationship.following || this.relationship.requested ? this.unfollow() : this.follow()
}, },
follow () { follow () {
this.inProgress = true this.inProgress = true

View file

@ -620,7 +620,6 @@
"grant_moderator": "Concedir permisos de Moderació" "grant_moderator": "Concedir permisos de Moderació"
}, },
"edit_profile": "Edita el perfil", "edit_profile": "Edita el perfil",
"follow_again": "Envia de nou la petició?",
"hidden": "Amagat", "hidden": "Amagat",
"follow_sent": "Petició enviada!", "follow_sent": "Petició enviada!",
"unmute_progress": "Deixant de silenciar…", "unmute_progress": "Deixant de silenciar…",

View file

@ -407,7 +407,6 @@
"follow": "Sledovat", "follow": "Sledovat",
"follow_sent": "Požadavek odeslán!", "follow_sent": "Požadavek odeslán!",
"follow_progress": "Odeslílám požadavek…", "follow_progress": "Odeslílám požadavek…",
"follow_again": "Odeslat požadavek znovu?",
"follow_unfollow": "Přestat sledovat", "follow_unfollow": "Přestat sledovat",
"followees": "Sledovaní", "followees": "Sledovaní",
"followers": "Sledující", "followers": "Sledující",

View file

@ -569,7 +569,6 @@
"follow": "Folgen", "follow": "Folgen",
"follow_sent": "Anfrage gesendet!", "follow_sent": "Anfrage gesendet!",
"follow_progress": "Anfragen…", "follow_progress": "Anfragen…",
"follow_again": "Anfrage erneut senden?",
"follow_unfollow": "Folgen beenden", "follow_unfollow": "Folgen beenden",
"followees": "Folgt", "followees": "Folgt",
"followers": "Folgende", "followers": "Folgende",

View file

@ -738,9 +738,9 @@
"edit_profile": "Edit profile", "edit_profile": "Edit profile",
"favorites": "Favorites", "favorites": "Favorites",
"follow": "Follow", "follow": "Follow",
"follow_cancel": "Cancel request",
"follow_sent": "Request sent!", "follow_sent": "Request sent!",
"follow_progress": "Requesting…", "follow_progress": "Requesting…",
"follow_again": "Send request again?",
"follow_unfollow": "Unfollow", "follow_unfollow": "Unfollow",
"followees": "Following", "followees": "Following",
"followers": "Followers", "followers": "Followers",

View file

@ -580,7 +580,6 @@
"follow": "Aboni", "follow": "Aboni",
"follow_sent": "Peto sendiĝis!", "follow_sent": "Peto sendiĝis!",
"follow_progress": "Petante…", "follow_progress": "Petante…",
"follow_again": "Ĉu sendi peton ree?",
"follow_unfollow": "Malaboni", "follow_unfollow": "Malaboni",
"followees": "Abonatoj", "followees": "Abonatoj",
"followers": "Abonantoj", "followers": "Abonantoj",

View file

@ -687,7 +687,6 @@
"follow": "Seguir", "follow": "Seguir",
"follow_sent": "¡Solicitud enviada!", "follow_sent": "¡Solicitud enviada!",
"follow_progress": "Solicitando…", "follow_progress": "Solicitando…",
"follow_again": "¿Enviar solicitud de nuevo?",
"follow_unfollow": "Dejar de seguir", "follow_unfollow": "Dejar de seguir",
"followees": "Siguiendo", "followees": "Siguiendo",
"followers": "Seguidores", "followers": "Seguidores",

View file

@ -569,7 +569,6 @@
"follow": "Jarraitu", "follow": "Jarraitu",
"follow_sent": "Eskaera bidalita!", "follow_sent": "Eskaera bidalita!",
"follow_progress": "Eskatzen…", "follow_progress": "Eskatzen…",
"follow_again": "Eskaera berriro bidali?",
"follow_unfollow": "Jarraitzeari utzi", "follow_unfollow": "Jarraitzeari utzi",
"followees": "Jarraitzen", "followees": "Jarraitzen",
"followers": "Jarraitzaileak", "followers": "Jarraitzaileak",

View file

@ -590,7 +590,6 @@
"follow": "Seuraa", "follow": "Seuraa",
"follow_sent": "Pyyntö lähetetty!", "follow_sent": "Pyyntö lähetetty!",
"follow_progress": "Pyydetään…", "follow_progress": "Pyydetään…",
"follow_again": "Lähetä pyyntö uudestaan?",
"follow_unfollow": "Älä seuraa", "follow_unfollow": "Älä seuraa",
"followees": "Seuraa", "followees": "Seuraa",
"followers": "Seuraajat", "followers": "Seuraajat",

View file

@ -624,7 +624,6 @@
"follow": "Suivre", "follow": "Suivre",
"follow_sent": "Demande envoyée !", "follow_sent": "Demande envoyée !",
"follow_progress": "Demande en cours…", "follow_progress": "Demande en cours…",
"follow_again": "Renvoyer la demande ?",
"follow_unfollow": "Désabonner", "follow_unfollow": "Désabonner",
"followees": "Suivis", "followees": "Suivis",
"followers": "Vous suivent", "followers": "Vous suivent",

View file

@ -312,7 +312,6 @@
"follow": "עקוב", "follow": "עקוב",
"follow_sent": "בקשה נשלחה!", "follow_sent": "בקשה נשלחה!",
"follow_progress": "מבקש…", "follow_progress": "מבקש…",
"follow_again": "שלח בקשה שוב?",
"follow_unfollow": "בטל עקיבה", "follow_unfollow": "בטל עקיבה",
"followees": "נעקבים", "followees": "נעקבים",
"followers": "עוקבים", "followers": "עוקבים",

View file

@ -322,7 +322,6 @@
"delete_user": "Hapus pengguna", "delete_user": "Hapus pengguna",
"delete_user_confirmation": "Apakah Anda benar-benar yakin? Tindakan ini tidak dapat dibatalkan." "delete_user_confirmation": "Apakah Anda benar-benar yakin? Tindakan ini tidak dapat dibatalkan."
}, },
"follow_again": "Kirim permintaan lagi?",
"follow_unfollow": "Berhenti mengikuti", "follow_unfollow": "Berhenti mengikuti",
"followees": "Mengikuti", "followees": "Mengikuti",
"followers": "Pengikut", "followers": "Pengikut",

View file

@ -516,7 +516,6 @@
"its_you": "Sei tu!", "its_you": "Sei tu!",
"hidden": "Nascosto", "hidden": "Nascosto",
"follow_unfollow": "Disconosci", "follow_unfollow": "Disconosci",
"follow_again": "Reinvio richiesta?",
"follow_progress": "Richiedo…", "follow_progress": "Richiedo…",
"follow_sent": "Richiesta inviata!", "follow_sent": "Richiesta inviata!",
"favorites": "Preferiti", "favorites": "Preferiti",

View file

@ -567,7 +567,6 @@
"follow": "フォロー", "follow": "フォロー",
"follow_sent": "リクエストを、おくりました!", "follow_sent": "リクエストを、おくりました!",
"follow_progress": "リクエストしています…", "follow_progress": "リクエストしています…",
"follow_again": "ふたたびリクエストをおくりますか?",
"follow_unfollow": "フォローをやめる", "follow_unfollow": "フォローをやめる",
"followees": "フォロー", "followees": "フォロー",
"followers": "フォロワー", "followers": "フォロワー",

View file

@ -680,7 +680,6 @@
"follow": "フォロー", "follow": "フォロー",
"follow_sent": "リクエストを送りました!", "follow_sent": "リクエストを送りました!",
"follow_progress": "リクエストしています…", "follow_progress": "リクエストしています…",
"follow_again": "再びリクエストを送りますか?",
"follow_unfollow": "フォローをやめる", "follow_unfollow": "フォローをやめる",
"followees": "フォロー", "followees": "フォロー",
"followers": "フォロワー", "followers": "フォロワー",

View file

@ -428,7 +428,6 @@
"follow": "팔로우", "follow": "팔로우",
"follow_sent": "요청 보내짐!", "follow_sent": "요청 보내짐!",
"follow_progress": "요청 중…", "follow_progress": "요청 중…",
"follow_again": "요청을 다시 보낼까요?",
"follow_unfollow": "팔로우 중지", "follow_unfollow": "팔로우 중지",
"followees": "팔로우 중", "followees": "팔로우 중",
"followers": "팔로워", "followers": "팔로워",

View file

@ -516,7 +516,6 @@
"follow": "Følg", "follow": "Følg",
"follow_sent": "Forespørsel sendt!", "follow_sent": "Forespørsel sendt!",
"follow_progress": "Forespør…", "follow_progress": "Forespør…",
"follow_again": "Gjenta forespørsel?",
"follow_unfollow": "Avfølg", "follow_unfollow": "Avfølg",
"followees": "Følger", "followees": "Følger",
"followers": "Følgere", "followers": "Følgere",

View file

@ -565,9 +565,9 @@
"deny": "Weigeren", "deny": "Weigeren",
"favorites": "Favorieten", "favorites": "Favorieten",
"follow": "Volgen", "follow": "Volgen",
"follow_cancel": "Aanvraag annuleren",
"follow_sent": "Aanvraag verzonden!", "follow_sent": "Aanvraag verzonden!",
"follow_progress": "Aanvragen…", "follow_progress": "Aanvragen…",
"follow_again": "Aanvraag opnieuw zenden?",
"follow_unfollow": "Stop volgen", "follow_unfollow": "Stop volgen",
"followees": "Aan het volgen", "followees": "Aan het volgen",
"followers": "Volgers", "followers": "Volgers",

View file

@ -465,7 +465,6 @@
"follow": "Seguir", "follow": "Seguir",
"follow_sent": "Demanda enviada!", "follow_sent": "Demanda enviada!",
"follow_progress": "Demanda…", "follow_progress": "Demanda…",
"follow_again": "Tornar enviar la demanda?",
"follow_unfollow": "Quitar de seguir", "follow_unfollow": "Quitar de seguir",
"followees": "Abonaments", "followees": "Abonaments",
"followers": "Seguidors", "followers": "Seguidors",

View file

@ -721,7 +721,6 @@
"follow": "Obserwuj", "follow": "Obserwuj",
"follow_sent": "Wysłano prośbę!", "follow_sent": "Wysłano prośbę!",
"follow_progress": "Wysyłam prośbę…", "follow_progress": "Wysyłam prośbę…",
"follow_again": "Wysłać prośbę ponownie?",
"follow_unfollow": "Przestań obserwować", "follow_unfollow": "Przestań obserwować",
"followees": "Obserwowani", "followees": "Obserwowani",
"followers": "Obserwujący", "followers": "Obserwujący",

View file

@ -575,7 +575,6 @@
"follow": "Seguir", "follow": "Seguir",
"follow_sent": "Pedido enviado!", "follow_sent": "Pedido enviado!",
"follow_progress": "Enviando…", "follow_progress": "Enviando…",
"follow_again": "Enviar solicitação novamente?",
"follow_unfollow": "Deixar de seguir", "follow_unfollow": "Deixar de seguir",
"followees": "Seguindo", "followees": "Seguindo",
"followers": "Seguidores", "followers": "Seguidores",

View file

@ -550,7 +550,6 @@
"follow": "Читать", "follow": "Читать",
"follow_sent": "Запрос отправлен!", "follow_sent": "Запрос отправлен!",
"follow_progress": "Запрашиваем…", "follow_progress": "Запрашиваем…",
"follow_again": "Запросить еще раз?",
"follow_unfollow": "Перестать читать", "follow_unfollow": "Перестать читать",
"followees": "Читаемые", "followees": "Читаемые",
"followers": "Читатели", "followers": "Читатели",

View file

@ -310,7 +310,6 @@
"user_card.follow": "Follow", "user_card.follow": "Follow",
"user_card.follow_sent": "Request sent!", "user_card.follow_sent": "Request sent!",
"user_card.follow_progress": "Requesting…", "user_card.follow_progress": "Requesting…",
"user_card.follow_again": "Send request again?",
"user_card.follow_unfollow": "Unfollow", "user_card.follow_unfollow": "Unfollow",
"user_card.followees": "Following", "user_card.followees": "Following",
"user_card.followers": "Followers", "user_card.followers": "Followers",

View file

@ -748,7 +748,6 @@
"message": "Повідомлення", "message": "Повідомлення",
"follow": "Підписатись", "follow": "Підписатись",
"follow_unfollow": "Відписатись", "follow_unfollow": "Відписатись",
"follow_again": "Відправити запит знову?",
"follow_sent": "Запит відправлено!", "follow_sent": "Запит відправлено!",
"blocked": "Заблоковано!", "blocked": "Заблоковано!",
"admin_menu": { "admin_menu": {

View file

@ -677,7 +677,6 @@
"follow": "关注", "follow": "关注",
"follow_sent": "请求已发送!", "follow_sent": "请求已发送!",
"follow_progress": "请求中…", "follow_progress": "请求中…",
"follow_again": "再次发送请求?",
"follow_unfollow": "取消关注", "follow_unfollow": "取消关注",
"followees": "正在关注", "followees": "正在关注",
"followers": "关注者", "followers": "关注者",

View file

@ -771,7 +771,6 @@
"follow": "關注", "follow": "關注",
"follow_sent": "請求已發送!", "follow_sent": "請求已發送!",
"follow_progress": "請求中…", "follow_progress": "請求中…",
"follow_again": "再次發送請求?",
"follow_unfollow": "取消關注", "follow_unfollow": "取消關注",
"followees": "正在關注", "followees": "正在關注",
"followers": "關注者", "followers": "關注者",