Don't hardcode ConfirmUserActionDialog title
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>pull/21833/head
							parent
							
								
									1f44233e05
								
							
						
					
					
						commit
						9495ccdbb5
					
				| 
						 | 
				
			
			@ -36,6 +36,7 @@ export default React.createClass({
 | 
			
		|||
        // group member object. Supply either this or 'member'
 | 
			
		||||
        groupMember: GroupMemberType,
 | 
			
		||||
        action: React.PropTypes.string.isRequired, // eg. 'Ban'
 | 
			
		||||
        title: React.PropTypes.string.isRequired, // eg. 'Ban this user?'
 | 
			
		||||
 | 
			
		||||
        // Whether to display a text field for a reason
 | 
			
		||||
        // If true, the second argument to onFinished will
 | 
			
		||||
| 
						 | 
				
			
			@ -75,7 +76,6 @@ export default React.createClass({
 | 
			
		|||
        const MemberAvatar = sdk.getComponent("views.avatars.MemberAvatar");
 | 
			
		||||
        const BaseAvatar = sdk.getComponent("views.avatars.BaseAvatar");
 | 
			
		||||
 | 
			
		||||
        const title = _t("%(actionVerb)s this person?", { actionVerb: this.props.action});
 | 
			
		||||
        const confirmButtonClass = classnames({
 | 
			
		||||
            'mx_Dialog_primary': true,
 | 
			
		||||
            'danger': this.props.danger,
 | 
			
		||||
| 
						 | 
				
			
			@ -113,7 +113,7 @@ export default React.createClass({
 | 
			
		|||
        return (
 | 
			
		||||
            <BaseDialog className="mx_ConfirmUserActionDialog" onFinished={this.props.onFinished}
 | 
			
		||||
                onEnterPressed={this.onOk}
 | 
			
		||||
                title={title}
 | 
			
		||||
                title={this.props.title}
 | 
			
		||||
            >
 | 
			
		||||
                <div className="mx_Dialog_content">
 | 
			
		||||
                    <div className="mx_ConfirmUserActionDialog_avatar">
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -69,6 +69,7 @@ module.exports = withMatrixClient(React.createClass({
 | 
			
		|||
        Modal.createDialog(ConfirmUserActionDialog, {
 | 
			
		||||
            groupMember: this.props.groupMember,
 | 
			
		||||
            action: _t('Remove from group'),
 | 
			
		||||
            title: _t('Remove this user from group?'),
 | 
			
		||||
            danger: true,
 | 
			
		||||
            onFinished: (proceed) => {
 | 
			
		||||
                if (!proceed) return;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -247,11 +247,11 @@ module.exports = withMatrixClient(React.createClass({
 | 
			
		|||
 | 
			
		||||
    onKick: function() {
 | 
			
		||||
        const membership = this.props.member.membership;
 | 
			
		||||
        const kickLabel = membership === "invite" ? _t("Disinvite") : _t("Kick");
 | 
			
		||||
        const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog");
 | 
			
		||||
        Modal.createTrackedDialog('Confirm User Action Dialog', 'onKick', ConfirmUserActionDialog, {
 | 
			
		||||
            member: this.props.member,
 | 
			
		||||
            action: kickLabel,
 | 
			
		||||
            action: membership === "invite" ? _t("Disinvite") : _t("Kick"),
 | 
			
		||||
            title: membership === "invite" ? _t("Disinvite this user?") : _t("Kick this user?"),
 | 
			
		||||
            askReason: membership == "join",
 | 
			
		||||
            danger: true,
 | 
			
		||||
            onFinished: (proceed, reason) => {
 | 
			
		||||
| 
						 | 
				
			
			@ -285,6 +285,7 @@ module.exports = withMatrixClient(React.createClass({
 | 
			
		|||
        Modal.createTrackedDialog('Confirm User Action Dialog', 'onBanOrUnban', ConfirmUserActionDialog, {
 | 
			
		||||
            member: this.props.member,
 | 
			
		||||
            action: this.props.member.membership == 'ban' ? _t("Unban") : _t("Ban"),
 | 
			
		||||
            title: this.props.member.membership == 'ban' ? _t("Unban this user?") : _t("Ban this user?"),
 | 
			
		||||
            askReason: this.props.member.membership != 'ban',
 | 
			
		||||
            danger: this.props.member.membership != 'ban',
 | 
			
		||||
            onFinished: (proceed, reason) => {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -72,6 +72,7 @@ const BannedUser = React.createClass({
 | 
			
		|||
        Modal.createTrackedDialog('Confirm User Action Dialog', 'onUnbanClick', ConfirmUserActionDialog, {
 | 
			
		||||
            member: this.props.member,
 | 
			
		||||
            action: _t('Unban'),
 | 
			
		||||
            title: _t('Unban this user?'),
 | 
			
		||||
            danger: false,
 | 
			
		||||
            onFinished: (proceed) => {
 | 
			
		||||
                if (!proceed) return;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue