2022.11 stable release #202

Merged
floatingghost merged 36 commits from develop into stable 2022-11-12 15:33:58 +00:00
3 changed files with 13 additions and 2 deletions
Showing only changes of commit 1e8fc5bcc4 - Show all commits

View file

@ -235,7 +235,7 @@
line-height: 22px; line-height: 22px;
flex-wrap: wrap; flex-wrap: wrap;
.following { .following, .requested_by {
flex: 1 0 auto; flex: 1 0 auto;
margin: 0; margin: 0;
margin-bottom: .25em; margin-bottom: .25em;

View file

@ -122,6 +122,12 @@
> >
{{ $t('user_card.follows_you') }} {{ $t('user_card.follows_you') }}
</div> </div>
<div
v-if="relationship.requested_by && loggedIn && isOtherUser"
class="requested_by"
>
{{ $t('user_card.requested_by') }}
</div>
<div <div
v-if="isOtherUser && (loggedIn || !switcher)" v-if="isOtherUser && (loggedIn || !switcher)"
class="highlighter" class="highlighter"

View file

@ -258,7 +258,11 @@
"placeholder": "myusername", "placeholder": "myusername",
"recovery_code": "Recovery code", "recovery_code": "Recovery code",
"register": "Register", "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": { "media_modal": {
"counter": "{current} / {total}", "counter": "{current} / {total}",
@ -1127,6 +1131,7 @@
"followers": "Followers", "followers": "Followers",
"following": "Following!", "following": "Following!",
"follows_you": "Follows you!", "follows_you": "Follows you!",
"requested_by": "Has requested to follow you",
"hidden": "Hidden", "hidden": "Hidden",
"hide_repeats": "Hide repeats", "hide_repeats": "Hide repeats",
"highlight": { "highlight": {