PartialTree - change the maxTotalFileSize error

[lakesare]

This is a series of PRs that make the #5050 PR smaller

---

Currently, exceeding the aggregate size of files is reported as "hi.png exceeds maximum allowed size of 20 MB", where "hi.png" is the first file that overflows the max allowed size (there might be many files after this first file!).

This PR changes this phrasing to "You selected 25 MB of files, but maximum allowed size is 20 MB".

The former phrasing looks a bit better when we're hovering over greyed-out files, however in #5050 UI we won't have greyed-out files, so we shouldn't worry about that.

The new phrasing makes more sense as an error notification, both in current UI and in #5050 UI.

Note

I understand it seems like we should change "You selected %{size} of files, but maximum allowed size is %{sizeAllowed}" to "You want to select %{size} of files, but maximum allowed size is %{sizeAllowed}", however the former phrasing fits the #5050 UI better.

Before

After

[github-actions]

Diff output files

diff --git a/packages/@uppy/core/lib/Restricter.js b/packages/@uppy/core/lib/Restricter.js
index 7a5ac8b..0dd13c1 100644
--- a/packages/@uppy/core/lib/Restricter.js
+++ b/packages/@uppy/core/lib/Restricter.js
@@ -53,22 +53,17 @@ class Restricter {
       }
     }
     if (maxTotalFileSize) {
-      let totalFilesSize = existingFiles.reduce((total, f) => {
+      const totalFilesSize = [...existingFiles, ...addingFiles].reduce((total, f) => {
         var _f$size;
         return total + ((_f$size = f.size) != null ? _f$size : 0);
       }, 0);
-      for (const addingFile of addingFiles) {
-        if (addingFile.size != null) {
-          totalFilesSize += addingFile.size;
-          if (totalFilesSize > maxTotalFileSize) {
-            throw new RestrictionError(
-              this.getI18n()("exceedsSize", {
-                size: prettierBytes(maxTotalFileSize),
-                file: addingFile.name,
-              }),
-            );
-          }
-        }
+      if (totalFilesSize > maxTotalFileSize) {
+        throw new RestrictionError(
+          this.getI18n()("aggregateExceedsSize", {
+            sizeAllowed: prettierBytes(maxTotalFileSize),
+            size: prettierBytes(totalFilesSize),
+          }),
+        );
       }
     }
   }
diff --git a/packages/@uppy/core/lib/locale.js b/packages/@uppy/core/lib/locale.js
index d0707fb..cdb4f7c 100644
--- a/packages/@uppy/core/lib/locale.js
+++ b/packages/@uppy/core/lib/locale.js
@@ -12,6 +12,7 @@ export default {
       0: "You have to select at least %{smart_count} file",
       1: "You have to select at least %{smart_count} files",
     },
+    aggregateExceedsSize: "You selected %{size} of files, but maximum allowed size is %{sizeAllowed}",
     exceedsSize: "%{file} exceeds maximum allowed size of %{size}",
     missingRequiredMetaField: "Missing required meta fields",
     missingRequiredMetaFieldOnFile: "Missing required meta fields in %{fileName}",

[Murderlon]

LGTM, one request