diff --git a/imports/i18n/data/de.i18n.json b/imports/i18n/data/de.i18n.json index 143dadd7c..ebcc111a8 100644 --- a/imports/i18n/data/de.i18n.json +++ b/imports/i18n/data/de.i18n.json @@ -134,7 +134,7 @@ "attachmentDeletePopup-title": "Anhang löschen?", "attachments": "Anhänge", "auto-watch": "Neue Boards nach Erstellung automatisch beobachten", - "avatar-too-big": "Das Profilbild ist zu groß (520KB max)", + "avatar-too-big": "Das Profilbild ist zu groß (__size__ max)", "back": "Zurück", "board-change-color": "Farbe ändern", "show-at-all-boards-page": "Zeige auf \"Alle Boards\" Seite", diff --git a/imports/i18n/data/en.i18n.json b/imports/i18n/data/en.i18n.json index 0d626b51b..c75345468 100644 --- a/imports/i18n/data/en.i18n.json +++ b/imports/i18n/data/en.i18n.json @@ -134,7 +134,7 @@ "attachmentDeletePopup-title": "Delete Attachment?", "attachments": "Attachments", "auto-watch": "Automatically watch boards when they are created", - "avatar-too-big": "The avatar is too large (520KB max)", + "avatar-too-big": "The avatar is too large (__size__ max)", "back": "Back", "board-change-color": "Change color", "show-at-all-boards-page" : "Show at All Boards page", diff --git a/models/avatars.js b/models/avatars.js index 488e7ed55..d74852101 100644 --- a/models/avatars.js +++ b/models/avatars.js @@ -3,10 +3,13 @@ import { FilesCollection } from 'meteor/ostrio:files'; import { formatFleURL } from 'meteor/ostrio:files/lib'; import { isFileValid } from './fileValidation'; import { createBucket } from './lib/grid/createBucket'; +import { TAPi18n } from '/imports/i18n'; import fs from 'fs'; import path from 'path'; import FileStoreStrategyFactory, { FileStoreStrategyFilesystem, FileStoreStrategyGridFs, STORAGE_NAME_FILESYSTEM } from '/models/lib/fileStoreStrategy'; +const filesize = require('filesize'); + let avatarsUploadExternalProgram; let avatarsUploadMimeTypes = []; let avatarsUploadSize = 72000; @@ -84,7 +87,7 @@ Avatars = new FilesCollection({ if (file.size <= avatarsUploadSize && file.type.startsWith('image/')) { return true; } - return 'avatar-too-big'; + return TAPi18n.__('avatar-too-big', {size: filesize(avatarsUploadSize)}); }, onAfterUpload(fileObj) { // current storage is the filesystem, update object and database