diff options
author | =Corey Hulen <corey@hulen.com> | 2016-02-01 14:44:17 -0800 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2016-02-01 14:44:17 -0800 |
commit | b4ec6900510077253290e361d1a706e5368a45de (patch) | |
tree | 6fc7c131fa7aa5f32e3aba8102416aa23c65963d /web/react/components/setting_upload.jsx | |
parent | ea71731f838fc010cfc7511c09875184d1b2396b (diff) | |
parent | f28486c4553f7f4bccf7bf69153c2f12699705f9 (diff) | |
download | chat-b4ec6900510077253290e361d1a706e5368a45de.tar.gz chat-b4ec6900510077253290e361d1a706e5368a45de.tar.bz2 chat-b4ec6900510077253290e361d1a706e5368a45de.zip |
Fixing merge
Diffstat (limited to 'web/react/components/setting_upload.jsx')
-rw-r--r-- | web/react/components/setting_upload.jsx | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/web/react/components/setting_upload.jsx b/web/react/components/setting_upload.jsx index a25789dff..5d5cdfdf7 100644 --- a/web/react/components/setting_upload.jsx +++ b/web/react/components/setting_upload.jsx @@ -1,6 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. +import {FormattedMessage} from 'mm-intl'; + export default class SettingsUpload extends React.Component { constructor(props) { super(props); @@ -41,7 +43,7 @@ export default class SettingsUpload extends React.Component { if (inputnode.files && inputnode.files[0]) { this.props.submit(inputnode.files[0]); } else { - this.setState({clientError: 'No file selected.'}); + this.setState({clientError: true}); } } @@ -49,7 +51,12 @@ export default class SettingsUpload extends React.Component { let clientError = null; if (this.state.clientError) { clientError = ( - <div className='file-status'>{this.state.clientError}</div> + <div className='file-status'> + <FormattedMessage + id='setting_upload.noFile' + defaultMessage='No file selected.' + /> + </div> ); } let serverError = null; @@ -75,7 +82,10 @@ export default class SettingsUpload extends React.Component { <ul className='setting-list'> <li className='setting-list-item'> <span className='btn btn-sm btn-primary btn-file sel-btn'> - {'Select file'} + <FormattedMessage + id='setting_upload.select' + defaultMessage='Select file' + /> <input ref='uploadinput' accept={this.props.fileTypesAccepted} @@ -87,7 +97,10 @@ export default class SettingsUpload extends React.Component { className={submitButtonClass} onClick={this.doSubmit} > - {'Import'} + <FormattedMessage + id='setting_upload.import' + defaultMessage='Import' + /> </a> {fileNameText} {serverError} |