Merge pull request #1387 from turt2live/travis/tooltip_redacter
Show who redacted an event on hover
This commit is contained in:
commit
141ae916ce
3 changed files with 8 additions and 1 deletions
|
@ -23,9 +23,14 @@ module.exports = React.createClass({
|
||||||
displayName: 'UnknownBody',
|
displayName: 'UnknownBody',
|
||||||
|
|
||||||
render: function() {
|
render: function() {
|
||||||
|
let tooltip = _t("Removed or unknown message type");
|
||||||
|
if (this.props.mxEvent.isRedacted()) {
|
||||||
|
tooltip = _t("Message removed by %(userId)s", {userId: this.props.mxEvent.getSender()});
|
||||||
|
}
|
||||||
|
|
||||||
const text = this.props.mxEvent.getContent().body;
|
const text = this.props.mxEvent.getContent().body;
|
||||||
return (
|
return (
|
||||||
<span className="mx_UnknownBody" title={_t("Removed or unknown message type")}>
|
<span className="mx_UnknownBody" title={tooltip}>
|
||||||
{text}
|
{text}
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
|
|
|
@ -837,6 +837,7 @@
|
||||||
"Autocomplete Delay (ms):": "Autocomplete Delay (ms):",
|
"Autocomplete Delay (ms):": "Autocomplete Delay (ms):",
|
||||||
"This Home server does not support groups": "This Home server does not support groups",
|
"This Home server does not support groups": "This Home server does not support groups",
|
||||||
"Loading device info...": "Loading device info...",
|
"Loading device info...": "Loading device info...",
|
||||||
|
"Message removed by %(userId)s": "Message removed by %(userId)s",
|
||||||
"Groups": "Groups",
|
"Groups": "Groups",
|
||||||
"Create a new group": "Create a new group",
|
"Create a new group": "Create a new group",
|
||||||
"Create Group": "Create Group",
|
"Create Group": "Create Group",
|
||||||
|
|
|
@ -848,6 +848,7 @@
|
||||||
"Autocomplete Delay (ms):": "Autocomplete Delay (ms):",
|
"Autocomplete Delay (ms):": "Autocomplete Delay (ms):",
|
||||||
"This Home server does not support groups": "This Home server does not support groups",
|
"This Home server does not support groups": "This Home server does not support groups",
|
||||||
"Loading device info...": "Loading device info...",
|
"Loading device info...": "Loading device info...",
|
||||||
|
"Message removed by %(userId)s": "Message removed by %(userId)s",
|
||||||
"Groups": "Groups",
|
"Groups": "Groups",
|
||||||
"Create a new group": "Create a new group",
|
"Create a new group": "Create a new group",
|
||||||
"Create Group": "Create Group",
|
"Create Group": "Create Group",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue