Improve upload error messages

packages/rocketchat-file-upload/.npm/package/npm-shrinkwrap.json

 {
   "dependencies": {
+    "filesize": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.3.0.tgz",
+      "from": "filesize@3.3.0"
+    },
+    "mime-db": {
+      "version": "1.23.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz",
+      "from": "mime-db@>=1.23.0 <1.24.0"
+    },
     "mime-types": {
       "version": "2.1.11",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
-      "from": "mime-types@2.1.11",
-      "dependencies": {
-        "mime-db": {
-          "version": "1.23.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz",
-          "from": "mime-db@1.23.0"
-        }
-      }
+      "from": "mime-types@2.1.11"
     }
   }
 }

packages/rocketchat-file-upload/client/lib/FileUploadFileSystem.js

@@ -53,6 +53,14 @@ FileUpload.FileSystem = class FileUploadFileSystem extends FileUploadBase {
 	}
 
 	start() {
+		const uploading = Session.get('uploading') || [];
+		const item = {
+			id: this.id,
+			name: this.getFileName(),
+			percentage: 0,
+		};
+		uploading.push(item);
+		Session.set('uploading', uploading);
 		return this.handler.start();
 	}
 

packages/rocketchat-file-upload/client/lib/FileUploadGridFS.js

@@ -44,6 +44,14 @@ FileUpload.GridFS = class FileUploadGridFS extends FileUploadBase {
 	}
 
 	start() {
+		const uploading = Session.get('uploading') || [];
+		const item = {
+			id: this.id,
+			name: this.getFileName(),
+			percentage: 0,
+		};
+		uploading.push(item);
+		Session.set('uploading', uploading);
 		return this.handler.start();
 	}
 

packages/rocketchat-file-upload/globalFileRestrictions.js

 /* globals Slingshot */
 
+import filesize from 'filesize';
+
 Slingshot.fileRestrictions('rocketchat-uploads', {
 	authorize: function(file/*, metaContext*/) {
 		if (!RocketChat.fileUploadIsValidContentType(file.type)) {
@@ -9,7 +11,7 @@ Slingshot.fileRestrictions('rocketchat-uploads', {
 		var maxFileSize = RocketChat.settings.get('FileUpload_MaxFileSize');
 
 		if (maxFileSize && maxFileSize < file.size) {
-			throw new Meteor.Error(TAPi18n.__('File_exceeds_allowed_size_of_bytes', { size: maxFileSize }));
+			throw new Meteor.Error(TAPi18n.__('File_exceeds_allowed_size_of_bytes', { size: filesize(maxFileSize) }));
 		}
 
 		//Deny uploads if user is not logged in.

packages/rocketchat-file-upload/lib/FileUpload.js

 /* globals FileUpload:true */
 /* exported FileUpload */
 
-var maxFileSize = 0;
+import filesize from 'filesize';
+
+let maxFileSize = 0;
 
 FileUpload = {
 	validateFileUpload(file) {
 		if (file.size > maxFileSize) {
-			throw new Meteor.Error('error-file-too-large', 'File is too large');
+			const user = Meteor.user();
+			const reason = TAPi18n.__('File_exceeds_allowed_size_of_bytes', {
+				size: filesize(maxFileSize),
+			}, user.language);
+			throw new Meteor.Error('error-file-too-large', reason);
 		}
 
 		if (!RocketChat.fileUploadIsValidContentType(file.type)) {
-			throw new Meteor.Error('error-invalid-file-type', 'File type is not accepted');
+			const user = Meteor.user();
+			const reason = TAPi18n.__('File_type_is_not_accepted', user.language);
+			throw new Meteor.Error('error-invalid-file-type', reason);
 		}
 
 		return true;

packages/rocketchat-file-upload/package.js

@@ -47,5 +47,6 @@ Package.onUse(function(api) {
 });
 
 Npm.depends({
-	'mime-types': '2.1.11'
+	'mime-types': '2.1.11',
+	'filesize': '3.3.0',
 });

packages/rocketchat-i18n/i18n/en.i18n.json

@@ -452,7 +452,8 @@
   "Field" : "Field",
   "Field_removed" : "Field removed",
   "Field_required" : "Field required",
-  "File_exceeds_allowed_size_of_bytes" : "File exceeds allowed size of __size__ bytes",
+  "File_exceeds_allowed_size_of_bytes" : "File exceeds allowed size of __size__.",
+  "File_type_is_not_accepted": "File type is not accepted.",
   "FileUpload" : "File Upload",
   "FileUpload_Enabled" : "File Uploads Enabled",
   "FileUpload_File_Empty" : "File empty",

packages/rocketchat-i18n/i18n/ja.i18n.json

@@ -412,7 +412,8 @@
   "Features_Enabled" : "有効な機能",
   "Field" : "フィールド",
   "Field_removed" : "フィールド削除",
-  "File_exceeds_allowed_size_of_bytes" : "ファイルが許可されているサイズ __size__ バイトを超過しています。",
+  "File_exceeds_allowed_size_of_bytes" : "ファイルが許可されているサイズ __size__ を超過しています。",
+  "File_type_is_not_accepted": "許可されていないファイルタイプです。",
   "FileUpload" : "ファイルアップロード",
   "FileUpload_Enabled" : "ファイルアップロードを有効にする",
   "FileUpload_File_Empty" : "ファイルが空です",