Replace username with display name in more places (#3040)

* Replace username with display name in more places

* More readable spread operator and translator user magic
This commit is contained in:
Clark Winkelmann 2021-08-22 00:34:34 +02:00 committed by GitHub
parent af89b23f67
commit aba6836bdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions

View File

@ -124,13 +124,18 @@ export default {
* @param {string} type
*/
showDeletionAlert(user, type) {
const { username, email } = user.data.attributes;
const message = {
success: 'core.forum.user_controls.delete_success_message',
error: 'core.forum.user_controls.delete_error_message',
}[type];
app.alerts.show({ type }, app.translator.trans(message, { username, email }));
app.alerts.show(
{ type },
app.translator.trans(message, {
user,
email: user.email(),
})
);
},
/**

View File

@ -46,7 +46,7 @@ class NotificationMailer
$blueprint->getEmailView(),
compact('blueprint', 'user'),
function (Message $message) use ($blueprint, $user) {
$message->to($user->email, $user->username)
$message->to($user->email, $user->display_name)
->subject($blueprint->getEmailSubject($this->translator));
}
);

View File

@ -5,7 +5,7 @@
@foreach ($posts as $post)
<div>
<?php $user = ! empty($post->relationships->user->data) ? $getResource($post->relationships->user->data) : null; ?>
<h3>{{ $user ? $user->attributes->username : $translator->trans('core.lib.username.deleted_text') }}</h3>
<h3>{{ $user ? $user->attributes->displayName : $translator->trans('core.lib.username.deleted_text') }}</h3>
<div class="Post-body">
{!! $post->attributes->contentHtml !!}
</div>