diff options
author | Asaad Mahmood <asaadmahmood@users.noreply.github.com> | 2017-08-07 05:23:16 +0500 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2017-08-06 17:23:16 -0700 |
commit | 9eb8d93a0d958b830b1f759dd0917629bd79c8e6 (patch) | |
tree | 2098d0e0ba18bd76aa40527faa4aaa9ca3168301 /webapp/components/delete_channel_modal.jsx | |
parent | 178ccd16cba26144eac404f413440867b360033c (diff) | |
download | chat-9eb8d93a0d958b830b1f759dd0917629bd79c8e6.tar.gz chat-9eb8d93a0d958b830b1f759dd0917629bd79c8e6.tar.bz2 chat-9eb8d93a0d958b830b1f759dd0917629bd79c8e6.zip |
Updating user access token UI (#7091)
* Updating user access token UI
Updating help text
Updating tokenlistClass
Updating string for token
Updating translations
Updating translations
Updating translations
* Updating translations
* Minor UI fix
* Update manage_tokens_modal.jsx
* Update user_settings_security.jsx
* Update en.json
* Fix merge conflicts
Diffstat (limited to 'webapp/components/delete_channel_modal.jsx')
-rw-r--r-- | webapp/components/delete_channel_modal.jsx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webapp/components/delete_channel_modal.jsx b/webapp/components/delete_channel_modal.jsx index fd5447524..92589ce42 100644 --- a/webapp/components/delete_channel_modal.jsx +++ b/webapp/components/delete_channel_modal.jsx @@ -4,7 +4,7 @@ import {Modal} from 'react-bootstrap'; import TeamStore from 'stores/team_store.jsx'; -import {FormattedMessage} from 'react-intl'; +import {FormattedMessage, FormattedHTMLMessage} from 'react-intl'; import {browserHistory} from 'react-router/es6'; @@ -64,9 +64,9 @@ export default class DeleteChannelModal extends React.Component { </Modal.Header> <Modal.Body> <div className='alert alert-danger'> - <FormattedMessage + <FormattedHTMLMessage id='delete_channel.question' - defaultMessage='This will delete the channel from the team and make its contents inaccessible for all users. Are you sure you wish to delete the {display_name} channel?' + defaultMessage='This will delete the channel from the team and make its contents inaccessible for all users. <br /><br />Are you sure you wish to delete the <strong>{display_name}</strong> channel?' values={{ display_name: this.props.channel.display_name }} |