diff --git a/js/components/ascribe_media/media_player.js b/js/components/ascribe_media/media_player.js index 3d032bef..749a9b0b 100644 --- a/js/components/ascribe_media/media_player.js +++ b/js/components/ascribe_media/media_player.js @@ -153,7 +153,7 @@ let MediaPlayer = React.createClass({ if (this.props.mimetype === 'video' && this.props.encodingStatus !== undefined && this.props.encodingStatus !== 100) { return (
-

Please be patient, the video is been encoded

+

Please be patient, the video is being encoded

diff --git a/js/components/ascribe_uploader/react_s3_fine_uploader.js b/js/components/ascribe_uploader/react_s3_fine_uploader.js index e6c5cb20..3ececa6d 100644 --- a/js/components/ascribe_uploader/react_s3_fine_uploader.js +++ b/js/components/ascribe_uploader/react_s3_fine_uploader.js @@ -209,6 +209,7 @@ var ReactS3FineUploader = React.createClass({ requestKey(fileId) { let defer = new fineUploader.Promise(); let filename = this.state.uploader.getName(fileId); + let uuid = this.state.uploader.getUuid(fileId); window.fetch(this.props.keyRoutine.url, { method: 'post', @@ -220,7 +221,8 @@ var ReactS3FineUploader = React.createClass({ credentials: 'include', body: JSON.stringify({ 'filename': filename, - 'file_class': this.props.keyRoutine.fileClass, + 'category': this.props.keyRoutine.fileClass, + 'uuid': uuid, 'piece_id': this.props.keyRoutine.pieceId }) })