sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801

Browse Source
This commit is contained in:
David Baker
2017-05-23 15:16:31 +01:00
parent 46bb29a3af
commit d419c42a4f
73 changed files with 4660 additions and 639 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/views/rooms/EventTile.js
+4 -3
View File
@@ -18,6 +18,7 @@ limitations under the License.
var React = require('react');
var classNames = require("classnames");
import _t from 'counterpart-riot';
var Modal = require('../../../Modal');
var sdk = require('../../../index');
@@ -464,9 +465,9 @@ module.exports = WithMatrixClient(React.createClass({
if (needsSenderProfile) {
let aux = null;
if (!this.props.tileShape) {
if (msgtype === 'm.image') aux = "sent an image";
else if (msgtype === 'm.video') aux = "sent a video";
else if (msgtype === 'm.file') aux = "uploaded a file";
if (msgtype === 'm.image') aux = _t('sent an image');
else if (msgtype === 'm.video') aux = _t('sent a video');
else if (msgtype === 'm.file') aux = _t('uploaded a file');
sender = <SenderProfile onClick={ this.onSenderProfileClick } mxEvent={this.props.mxEvent} aux={aux} />;
}
else {