Merge pull request #2849 from h3poteto/iss-2815
refs #2815 Fix username in notifications
This commit is contained in:
commit
61347adbd6
|
@ -16,8 +16,16 @@
|
||||||
<icon name="star" scale="0.7"></icon>
|
<icon name="star" scale="0.7"></icon>
|
||||||
</div>
|
</div>
|
||||||
<div class="action-detail">
|
<div class="action-detail">
|
||||||
<span class="bold" @click="openUser(message.account)"><bdi v-html="username(message.account)"></bdi></span
|
<span class="bold" @click="openUser(message.account)">
|
||||||
>{{ $t('notification.favourite.body') }}
|
<bdi
|
||||||
|
v-html="
|
||||||
|
$t('notification.favourite.body', {
|
||||||
|
username: username(message.account),
|
||||||
|
interpolation: { escapeValue: false }
|
||||||
|
})
|
||||||
|
"
|
||||||
|
></bdi>
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="action-icon" role="presentation">
|
<div class="action-icon" role="presentation">
|
||||||
<FailoverImg :src="message.account.avatar" :alt="`Avatar of ${message.account.username}`" />
|
<FailoverImg :src="message.account.avatar" :alt="`Avatar of ${message.account.username}`" />
|
||||||
|
|
|
@ -15,8 +15,16 @@
|
||||||
<icon name="user-plus" scale="0.8"></icon>
|
<icon name="user-plus" scale="0.8"></icon>
|
||||||
</div>
|
</div>
|
||||||
<div class="action-detail">
|
<div class="action-detail">
|
||||||
<span class="bold" @click="openUser(message.account)"><bdi v-html="username(message.account)"></bdi></span
|
<span class="bold" @click="openUser(message.account)">
|
||||||
>{{ $t('notification.follow.body') }}
|
<bdi
|
||||||
|
v-html="
|
||||||
|
$t('notification.follow.body', {
|
||||||
|
username: username(message.account),
|
||||||
|
interpolation: { escapeValue: false }
|
||||||
|
})
|
||||||
|
"
|
||||||
|
></bdi>
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="action-icon" role="presentation">
|
<div class="action-icon" role="presentation">
|
||||||
<FailoverImg :src="message.account.avatar" />
|
<FailoverImg :src="message.account.avatar" />
|
||||||
|
|
|
@ -15,9 +15,15 @@
|
||||||
<icon name="user-plus" scale="0.8"></icon>
|
<icon name="user-plus" scale="0.8"></icon>
|
||||||
</div>
|
</div>
|
||||||
<div class="action-detail">
|
<div class="action-detail">
|
||||||
{{ $t('notification.follow_request.body') }}
|
|
||||||
<span class="bold" @click="openUser(message.account)">
|
<span class="bold" @click="openUser(message.account)">
|
||||||
<bdi v-html="username(message.account)"></bdi>
|
<bdi
|
||||||
|
v-html="
|
||||||
|
$t('notification.follow_request.body', {
|
||||||
|
username: username(message.account),
|
||||||
|
interpolation: { escapeValue: false }
|
||||||
|
})
|
||||||
|
"
|
||||||
|
></bdi>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="action-icon" role="presentation">
|
<div class="action-icon" role="presentation">
|
||||||
|
|
|
@ -16,8 +16,16 @@
|
||||||
<icon name="poll-h" scale="0.9"></icon>
|
<icon name="poll-h" scale="0.9"></icon>
|
||||||
</div>
|
</div>
|
||||||
<div class="action-detail">
|
<div class="action-detail">
|
||||||
<span class="bold" @click="openUser(message.account)"><bdi v-html="username(message.account)"></bdi></span
|
<span class="bold" @click="openUser(message.account)">
|
||||||
>{{ $t('notification.poll_expired.body') }}
|
<bdi
|
||||||
|
v-html="
|
||||||
|
$t('notification.poll_expired.body', {
|
||||||
|
username: username(message.account),
|
||||||
|
interpolation: { escapeValue: false }
|
||||||
|
})
|
||||||
|
"
|
||||||
|
></bdi>
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="action-icon" role="presentation">
|
<div class="action-icon" role="presentation">
|
||||||
<FailoverImg :src="message.account.avatar" :alt="`Avatar of ${message.account.username}`" />
|
<FailoverImg :src="message.account.avatar" :alt="`Avatar of ${message.account.username}`" />
|
||||||
|
|
|
@ -16,8 +16,16 @@
|
||||||
<icon name="poll-h" scale="0.9"></icon>
|
<icon name="poll-h" scale="0.9"></icon>
|
||||||
</div>
|
</div>
|
||||||
<div class="action-detail">
|
<div class="action-detail">
|
||||||
<span class="bold" @click="openUser(message.account)"><bdi v-html="username(message.account)"></bdi></span
|
<span class="bold" @click="openUser(message.account)">
|
||||||
>{{ $t('notification.poll_vote.body') }}
|
<bdi
|
||||||
|
v-html="
|
||||||
|
$t('notification.poll_vote.body', {
|
||||||
|
username: username(message.account),
|
||||||
|
interpolation: { escapeValue: false }
|
||||||
|
})
|
||||||
|
"
|
||||||
|
></bdi>
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="action-icon" role="presentation">
|
<div class="action-icon" role="presentation">
|
||||||
<FailoverImg :src="message.account.avatar" :alt="`Avatar of ${message.account.username}`" />
|
<FailoverImg :src="message.account.avatar" :alt="`Avatar of ${message.account.username}`" />
|
||||||
|
|
|
@ -16,8 +16,16 @@
|
||||||
<icon name="retweet" scala="0.7"></icon>
|
<icon name="retweet" scala="0.7"></icon>
|
||||||
</div>
|
</div>
|
||||||
<div class="action-detail">
|
<div class="action-detail">
|
||||||
<span class="bold" @click="openUser(message.account)"><bdi v-html="username(message.account)"></bdi></span
|
<span class="bold" @click="openUser(message.account)">
|
||||||
>{{ $t('notification.quote.body') }}
|
<bdi
|
||||||
|
v-html="
|
||||||
|
$t('notification.quote.body', {
|
||||||
|
username: username(message.account),
|
||||||
|
interpolation: { escapeValue: false }
|
||||||
|
})
|
||||||
|
"
|
||||||
|
></bdi>
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="action-icon" role="presentation">
|
<div class="action-icon" role="presentation">
|
||||||
<FailoverImg :src="message.account.avatar" :alt="`Avatar of ${message.account.username}`" />
|
<FailoverImg :src="message.account.avatar" :alt="`Avatar of ${message.account.username}`" />
|
||||||
|
|
|
@ -16,8 +16,16 @@
|
||||||
{{ message.emoji }}
|
{{ message.emoji }}
|
||||||
</div>
|
</div>
|
||||||
<div class="action-detail">
|
<div class="action-detail">
|
||||||
<span class="bold" @click="openUser(message.account)"><bdi v-html="username(message.account)"></bdi></span
|
<span class="bold" @click="openUser(message.account)">
|
||||||
>{{ $t('notification.reaction.body') }}
|
<bdi
|
||||||
|
v-html="
|
||||||
|
$t('notification.reaction.body', {
|
||||||
|
username: username(message.account),
|
||||||
|
interpolation: { escapeValue: false }
|
||||||
|
})
|
||||||
|
"
|
||||||
|
></bdi>
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="action-icon" role="presentation">
|
<div class="action-icon" role="presentation">
|
||||||
<FailoverImg :src="message.account.avatar" :alt="`Avatar of ${message.account.username}`" />
|
<FailoverImg :src="message.account.avatar" :alt="`Avatar of ${message.account.username}`" />
|
||||||
|
|
|
@ -16,8 +16,16 @@
|
||||||
<icon name="retweet" scala="0.7"></icon>
|
<icon name="retweet" scala="0.7"></icon>
|
||||||
</div>
|
</div>
|
||||||
<div class="action-detail">
|
<div class="action-detail">
|
||||||
<span class="bold" @click="openUser(message.account)"><bdi v-html="username(message.account)"></bdi></span
|
<span class="bold" @click="openUser(message.account)">
|
||||||
>{{ $t('notification.reblog.body') }}
|
<bdi
|
||||||
|
v-html="
|
||||||
|
$t('notification.reblog.body', {
|
||||||
|
username: username(message.account),
|
||||||
|
interpolation: { escapeValue: false }
|
||||||
|
})
|
||||||
|
"
|
||||||
|
></bdi>
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="action-icon" role="presentation">
|
<div class="action-icon" role="presentation">
|
||||||
<FailoverImg :src="message.account.avatar" :alt="`Avatar of ${message.account.username}`" />
|
<FailoverImg :src="message.account.avatar" :alt="`Avatar of ${message.account.username}`" />
|
||||||
|
|
|
@ -5,8 +5,16 @@
|
||||||
<icon name="home" scale="0.9"></icon>
|
<icon name="home" scale="0.9"></icon>
|
||||||
</div>
|
</div>
|
||||||
<div class="action-detail">
|
<div class="action-detail">
|
||||||
<span class="bold" @click="openUser(message.account)"><bdi v-html="username(message.account)"></bdi></span
|
<span class="bold" @click="openUser(message.account)">
|
||||||
>{{ $t('notification.status.body') }}
|
<bdi
|
||||||
|
v-html="
|
||||||
|
$t('notification.status.body', {
|
||||||
|
username: username(message.account),
|
||||||
|
interpolation: { escapeValue: false }
|
||||||
|
})
|
||||||
|
"
|
||||||
|
></bdi>
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="action-icon" role="presentation">
|
<div class="action-icon" role="presentation">
|
||||||
<FailoverImg :src="message.account.avatar" :alt="`Avatar of ${message.account.username}`" />
|
<FailoverImg :src="message.account.avatar" :alt="`Avatar of ${message.account.username}`" />
|
||||||
|
|
Loading…
Reference in New Issue