diff options
author | =Corey Hulen <corey@hulen.com> | 2015-09-10 15:15:04 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-09-10 15:15:04 -0700 |
commit | 83b04181da84d0456dfa02b8d52953eb3fd3d7d1 (patch) | |
tree | 49510d8a6d4be6aeed9a86816cffcbc82d66b09b /web/react/components/team_import_tab.jsx | |
parent | 1108ac53063bedcfe00647fa0577e91cf60555de (diff) | |
parent | 927b474005b9e6c03f7385f4d1a06626dd0450e3 (diff) | |
download | chat-83b04181da84d0456dfa02b8d52953eb3fd3d7d1.tar.gz chat-83b04181da84d0456dfa02b8d52953eb3fd3d7d1.tar.bz2 chat-83b04181da84d0456dfa02b8d52953eb3fd3d7d1.zip |
merging
Diffstat (limited to 'web/react/components/team_import_tab.jsx')
-rw-r--r-- | web/react/components/team_import_tab.jsx | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/web/react/components/team_import_tab.jsx b/web/react/components/team_import_tab.jsx index 1ab348465..031abc36a 100644 --- a/web/react/components/team_import_tab.jsx +++ b/web/react/components/team_import_tab.jsx @@ -34,13 +34,11 @@ export default class TeamImportTab extends React.Component { render() { var uploadHelpText = ( <div> - <br/> - Slack does not allow you to export files, images, private groups or direct messages stored in Slack. Therefore, Slack import to Mattermost only supports importing of text messages in your Slack team's public channels. - <br/><br/> - The Slack import to Mattermost is in "Preview". Slack bot posts and channels with underscores do not yet import. - <br/><br/> + <p>{'Slack does not allow you to export files, images, private groups or direct messages stored in Slack. Therefore, Slack import to Mattermost only supports importing of text messages in your Slack team\'\s public channels.'}</p> + <p>{'The Slack import to Mattermost is in "Preview". Slack bot posts and channels with underscores do not yet import.'}</p> </div> ); + var uploadSection = ( <SettingUpload title='Import from Slack' @@ -58,7 +56,7 @@ export default class TeamImportTab extends React.Component { break; case 'in-progress': messageSection = ( - <p className='confirm-import alert alert-warning'><i className='fa fa-spinner fa-pulse'></i> Importing...</p> + <p className='confirm-import alert alert-warning'><i className='fa fa-spinner fa-pulse'></i>{' Importing...'}</p> ); break; case 'done': @@ -99,18 +97,18 @@ export default class TeamImportTab extends React.Component { data-dismiss='modal' aria-label='Close' > - <span aria-hidden='true'>×</span> + <span aria-hidden='true'>{'×'}</span> </button> <h4 className='modal-title' ref='title' - ><i className='modal-back'></i>Import</h4> + ><i className='modal-back'></i>{'Import'}</h4> </div> <div ref='wrapper' className='user-settings' > - <h3 className='tab-header'>Import</h3> + <h3 className='tab-header'>{'Import'}</h3> <div className='divider-dark first'/> {uploadSection} <div className='divider-dark'/> |