Merge pull request #1387 from turt2live/travis/tooltip_redacter

Show who redacted an event on hover

Author: ara4n

src/components/views/messages/UnknownBody.js

@@ -23,9 +23,14 @@ module.exports = React.createClass({
     displayName: 'UnknownBody',
 
     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;
         return (
-            <span className="mx_UnknownBody" title={_t("Removed or unknown message type")}>
+            <span className="mx_UnknownBody" title={tooltip}>
                 {text}
             </span>
         );

src/i18n/strings/en_EN.json

@@ -837,6 +837,7 @@
     "Autocomplete Delay (ms):": "Autocomplete Delay (ms):",
     "This Home server does not support groups": "This Home server does not support groups",
     "Loading device info...": "Loading device info...",
+    "Message removed by %(userId)s": "Message removed by %(userId)s",
     "Groups": "Groups",
     "Create a new group": "Create a new group",
     "Create Group": "Create Group",

src/i18n/strings/en_US.json

@@ -848,6 +848,7 @@
     "Autocomplete Delay (ms):": "Autocomplete Delay (ms):",
     "This Home server does not support groups": "This Home server does not support groups",
     "Loading device info...": "Loading device info...",
+    "Message removed by %(userId)s": "Message removed by %(userId)s",
     "Groups": "Groups",
     "Create a new group": "Create a new group",
     "Create Group": "Create Group",