imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3220 from matrix-org/travis/kick-reason

Browse source 
Don't show a reason if there's no reason for a kick/ban
This commit is contained in:
Travis Ralston 2019-07-15 09:30:19 -06:00 • committed by GitHub
commit 3fcbd46939
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/rooms/RoomPreviewBar.js
View file

@ -305,7 +305,7 @@ module.exports = React.createClass({
const {memberName, reason} = this._getKickOrBanInfo(); const {memberName, reason} = this._getKickOrBanInfo();
title = _t("You were kicked from %(roomName)s by %(memberName)s", title = _t("You were kicked from %(roomName)s by %(memberName)s",
{memberName, roomName: this._roomName()}); {memberName, roomName: this._roomName()});
subTitle = _t("Reason: %(reason)s", {reason}); subTitle = reason ? _t("Reason: %(reason)s", {reason}) : null;
if (this._joinRule() === "invite") { if (this._joinRule() === "invite") {
primaryActionLabel = _t("Forget this room"); primaryActionLabel = _t("Forget this room");
@ -322,7 +322,7 @@ module.exports = React.createClass({
const {memberName, reason} = this._getKickOrBanInfo(); const {memberName, reason} = this._getKickOrBanInfo();
title = _t("You were banned from %(roomName)s by %(memberName)s", title = _t("You were banned from %(roomName)s by %(memberName)s",
{memberName, roomName: this._roomName()}); {memberName, roomName: this._roomName()});
subTitle = _t("Reason: %(reason)s", {reason}); subTitle = reason ? _t("Reason: %(reason)s", {reason}) : null;
primaryActionLabel = _t("Forget this room"); primaryActionLabel = _t("Forget this room");
primaryActionHandler = this.props.onForgetClick; primaryActionHandler = this.props.onForgetClick;
break; break;