d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #554 from Jedi18/display_name_wording

Browse source 
Change display name wording
This commit is contained in:
DeepBlueV7.X 2021-04-18 06:24:11 +00:00 committed by GitHub
commit 01ee25cee4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/timeline/TimelineModel.cpp
View file

@ -1463,8 +1463,9 @@ TimelineModel::formatMemberEvent(QString id)
} }
} }
QString user = QString::fromStdString(event->state_key); QString user = QString::fromStdString(event->state_key);
QString name = utils::replaceEmoji(displayName(user)); QString name = utils::replaceEmoji(displayName(user));
QString oldName = QString::fromStdString(prevEvent->content.display_name);
QString rendered; QString rendered;
// see table https://matrix.org/docs/spec/client_server/latest#m-room-member // see table https://matrix.org/docs/spec/client_server/latest#m-room-member
@ -1481,10 +1482,12 @@ TimelineModel::formatMemberEvent(QString id)
prevEvent->content.avatar_url != event->content.avatar_url; prevEvent->content.avatar_url != event->content.avatar_url;
if (displayNameChanged && avatarChanged) if (displayNameChanged && avatarChanged)
rendered = rendered = tr("%1 has changed their avatar and changed their "
tr("%1 changed their display name and avatar.").arg(name); "display name to %2.")
.arg(oldName, name);
else if (displayNameChanged) else if (displayNameChanged)
rendered = tr("%1 changed their display name.").arg(name); rendered =
tr("%1 has changed their display name to %2.").arg(oldName, name);
else if (avatarChanged) else if (avatarChanged)
rendered = tr("%1 changed their avatar.").arg(name); rendered = tr("%1 changed their avatar.").arg(name);
else else