Merge branch 'develop' into luke/groups-room-info

2017-11-02 10:56:33 +00:00 · 2017-11-02 10:56:33 +00:00 · e909d859ab
commit e909d859ab
parent 80f79e6b84 815b42f0ac
16 changed files with 214 additions and 242 deletions
--- a/src/components/views/groups/GroupMemberInfo.js
+++ b/src/components/views/groups/GroupMemberInfo.js
@ -85,6 +85,8 @@ module.exports = React.createClass({
        Modal.createDialog(ConfirmUserActionDialog, {
            groupMember: this.props.groupMember,
            action: this.state.isUserInvited ? _t('Disinvite') : _t('Remove from community'),
+            title: this.state.isUserInvited ? _t('Disinvite this user from community?')
+                                            : _t('Remove this user from community?'),
            danger: true,
            onFinished: (proceed) => {
                if (!proceed) return;