aboutsummaryrefslogtreecommitdiff
path: root/src/components
diff options
context:
space:
mode:
Diffstat (limited to 'src/components')
-rw-r--r--src/components/media_upload/media_upload.js4
-rw-r--r--src/components/post_status_form/post_status_form.js6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js
index c2f3c3c7..91ae3627 100644
--- a/src/components/media_upload/media_upload.js
+++ b/src/components/media_upload/media_upload.js
@@ -22,7 +22,7 @@ const mediaUpload = {
const self = this
const store = this.$store
if (file.size > store.state.instance.uploadlimit) {
- self.$emit('upload-failed', 'upload_error_file_too_big')
+ self.$emit('upload-failed', 'upload_error_file_too_big', {filesize: file.size, allowedsize: store.state.instance.uploadlimit})
return
}
const formData = new FormData()
@@ -36,7 +36,7 @@ const mediaUpload = {
self.$emit('uploaded', fileData)
self.uploading = false
}, (error) => { // eslint-disable-line handle-callback-err
- self.$emit('upload-failed')
+ self.$emit('upload-failed', 'upload_error_generic')
self.uploading = false
})
},
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index f7ba3cd5..5f092da3 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -262,9 +262,9 @@ const PostStatusForm = {
let index = this.newStatus.files.indexOf(fileInfo)
this.newStatus.files.splice(index, 1)
},
- uploadFailed (errString) {
- errString = errString || 'upload_error'
- this.error = this.$t('post_status.' + errString)
+ uploadFailed (errString, templateArgs) {
+ templateArgs = templateArgs || {};
+ this.error = this.$t('post_status.upload_error') + ' ' + this.$t('post_status.' + errString, templateArgs)
this.enableSubmit()
},
disableSubmit () {