PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Don't try to show unset display name

Browse source 
In the ReadReceiptMarker title, show the display name only when it is not the
same as the user ID.
This commit is contained in:
Aidan Gauland 2018-03-23 17:14:29 +13:00
parent 7e1913ef3c
commit 3d4feac75b
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/components/views/rooms/ReadReceiptMarker.js
View file

@ -185,13 +185,23 @@ module.exports = React.createClass({
let title; let title;
if (this.props.timestamp) { if (this.props.timestamp) {
const dateString = formatDate(new Date(this.props.timestamp), this.props.showTwelveHour);
if (this.props.member.userId === this.props.member.rawDisplayName) {
title = _t(
"Seen by %(userName)s at %(dateTime)s",
{userName: this.props.member.userId,
dateTime: dateString},
);
}
else {
title = _t( title = _t(
"Seen by %(displayName)s (%(userName)s) at %(dateTime)s", "Seen by %(displayName)s (%(userName)s) at %(dateTime)s",
{displayName: this.props.member.rawDisplayName, {displayName: this.props.member.rawDisplayName,
userName: this.props.member.userId, userName: this.props.member.userId,
dateTime: formatDate(new Date(this.props.timestamp), this.props.showTwelveHour)}, dateTime: dateString},
); );
} }
}
return ( return (
<Velociraptor <Velociraptor

1
src/i18n/strings/en_EN.json
View file

@ -389,6 +389,7 @@
"Offline": "Offline", "Offline": "Offline",
"Unknown": "Unknown", "Unknown": "Unknown",
"Replying": "Replying", "Replying": "Replying",
"Seen by %(userName)s at %(dateTime)s": "Seen by %(userName)s at %(dateTime)s",
"Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Seen by %(displayName)s (%(userName)s) at %(dateTime)s", "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Seen by %(displayName)s (%(userName)s) at %(dateTime)s",
"No rooms to show": "No rooms to show", "No rooms to show": "No rooms to show",
"Unnamed room": "Unnamed room", "Unnamed room": "Unnamed room",