From 1e8fc5bcc4b12778a62b08c1bd3c8f5f54a2c831 Mon Sep 17 00:00:00 2001 From: FloatingGhost <hannah@coffee-and-dreams.uk> Date: Thu, 10 Nov 2022 03:01:20 +0000 Subject: [PATCH] Add "requested to follow you" text on card --- src/components/user_card/user_card.scss | 2 +- src/components/user_card/user_card.vue | 6 ++++++ src/i18n/en.json | 7 ++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/components/user_card/user_card.scss b/src/components/user_card/user_card.scss index 2e153120..07ab7bec 100644 --- a/src/components/user_card/user_card.scss +++ b/src/components/user_card/user_card.scss @@ -235,7 +235,7 @@ line-height: 22px; flex-wrap: wrap; - .following { + .following, .requested_by { flex: 1 0 auto; margin: 0; margin-bottom: .25em; diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue index c04250aa..1de9c0bb 100644 --- a/src/components/user_card/user_card.vue +++ b/src/components/user_card/user_card.vue @@ -122,6 +122,12 @@ > {{ $t('user_card.follows_you') }} </div> + <div + v-if="relationship.requested_by && loggedIn && isOtherUser" + class="requested_by" + > + {{ $t('user_card.requested_by') }} + </div> <div v-if="isOtherUser && (loggedIn || !switcher)" class="highlighter" diff --git a/src/i18n/en.json b/src/i18n/en.json index 9cb5e3c7..8a2a9f1e 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -258,7 +258,11 @@ "placeholder": "myusername", "recovery_code": "Recovery code", "register": "Register", - "username": "Username" + "username": "Username", + "logout_confirm_cancel_button": "Cancel", + "logout_confirm_accept_button": "Log out", + "logout_confirm": "Are you sure you want to log out?", + "logout_confirm_title": "Log out" }, "media_modal": { "counter": "{current} / {total}", @@ -1127,6 +1131,7 @@ "followers": "Followers", "following": "Following!", "follows_you": "Follows you!", + "requested_by": "Has requested to follow you", "hidden": "Hidden", "hide_repeats": "Hide repeats", "highlight": {