ifd3f/pleroma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Projects Releases Packages Wiki Activity

Count in binary bytes and remove i18 from file size format service

Browse source
This commit is contained in:
Rinpatch 2018-12-10 17:06:32 +03:00
parent 88145c5934
commit 6a00854189
4 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/media_upload/media_upload.js
View file

@ -23,7 +23,9 @@ const mediaUpload = {
const self = this const self = this
const store = this.$store const store = this.$store
if (file.size > store.state.instance.uploadlimit) { if (file.size > store.state.instance.uploadlimit) {
self.$emit('upload-failed', 'upload_error_file_too_big', {filesize: fileSizeFormatService.fileSizeFormat(file.size, self.$t), allowedsize: fileSizeFormatService.fileSizeFormat(store.state.instance.uploadlimit, self.$t)}) const filesize = fileSizeFormatService.fileSizeFormat(file.size)
const allowedsize = fileSizeFormatService.fileSizeFormat(store.state.instance.uploadlimit)
self.$emit('upload-failed', 'upload_error_file_too_big', {filesize: filesize.num, filesizeunit: filesize.unit, allowedsize: allowedsize.num, allowedsizeunit: allowedsize.unit})
return return
} }
const formData = new FormData() const formData = new FormData()

10
src/i18n/en.json
View file

@ -53,7 +53,7 @@
"account_not_locked_warning_link": "locked", "account_not_locked_warning_link": "locked",
"attachments_sensitive": "Mark attachments as sensitive", "attachments_sensitive": "Mark attachments as sensitive",
"upload_error": "Upload failed.", "upload_error": "Upload failed.",
"upload_error_file_too_big": "File too big [{filesize} / {allowedsize}]", "upload_error_file_too_big": "File too big [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
"upload_error_generic": "Try again later", "upload_error_generic": "Try again later",
"content_type": { "content_type": {
"plain_text": "Plain text" "plain_text": "Plain text"
@ -232,9 +232,9 @@
}, },
"file_size_units": { "file_size_units": {
"B": "B", "B": "B",
"KB": "KB", "KiB": "KiB",
"MB": "MB", "MiB": "MiB",
"GB": "GB", "GiB": "GiB",
"TB": "TB" "TiB": "TiB"
} }
} }

BIN
src/services/file_size_format/.file_size_format.js.swp
View file

Binary file not shown.

10
src/services/file_size_format/file_size_format.js
View file

@ -1,15 +1,15 @@
const fileSizeFormat = (num, t) => { const fileSizeFormat = (num) => {
var exponent var exponent
var unit var unit
var units = [t('file_size_units.B'), t('file_size_units.KB'), t('file_size_units.MB'), t('file_size_units.GB'), t('file_size_units.TB')] var units = ['B', 'KiB', 'MiB', 'GiB', 'TiB']
if (num < 1) { if (num < 1) {
return num + ' ' + units[0] return num + ' ' + units[0]
} }
exponent = Math.min(Math.floor(Math.log(num) / Math.log(1000)), units.length - 1) exponent = Math.min(Math.floor(Math.log(num) / Math.log(1024)), units.length - 1)
num = (num / Math.pow(1000, exponent)).toFixed(2) * 1 num = (num / Math.pow(1024, exponent)).toFixed(2) * 1
unit = units[exponent] unit = units[exponent]
return num + ' ' + unit return {num: num, unit: unit}
} }
const fileSizeFormatService = { const fileSizeFormatService = {
fileSizeFormat fileSizeFormat