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

2017-11-02 13:39:33 +00:00 · 2017-11-02 13:39:33 +00:00 · bf77b51b5e
commit bf77b51b5e
parent 790db94fd7 6baf6af332
16 changed files with 215 additions and 244 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;