@uppy/core: reference updated i18n in Restricter #5118
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff output filesdiff --git a/packages/@uppy/core/lib/Restricter.js b/packages/@uppy/core/lib/Restricter.js
index 3174ead..7a5ac8b 100644
--- a/packages/@uppy/core/lib/Restricter.js
+++ b/packages/@uppy/core/lib/Restricter.js
@@ -23,8 +23,8 @@ class RestrictionError extends Error {
}
}
class Restricter {
- constructor(getOpts, i18n) {
- this.i18n = i18n;
+ constructor(getOpts, getI18n) {
+ this.getI18n = getI18n;
this.getOpts = () => {
var _opts$restrictions;
const opts = getOpts();
@@ -46,7 +46,7 @@ class Restricter {
const nonGhostFiles = existingFiles.filter(f => !f.isGhost);
if (nonGhostFiles.length + addingFiles.length > maxNumberOfFiles) {
throw new RestrictionError(`${
- this.i18n("youCanOnlyUploadX", {
+ this.getI18n()("youCanOnlyUploadX", {
smart_count: maxNumberOfFiles,
})
}`);
@@ -61,10 +61,12 @@ class Restricter {
if (addingFile.size != null) {
totalFilesSize += addingFile.size;
if (totalFilesSize > maxTotalFileSize) {
- throw new RestrictionError(this.i18n("exceedsSize", {
- size: prettierBytes(maxTotalFileSize),
- file: addingFile.name,
- }));
+ throw new RestrictionError(
+ this.getI18n()("exceedsSize", {
+ size: prettierBytes(maxTotalFileSize),
+ file: addingFile.name,
+ }),
+ );
}
}
}
@@ -90,7 +92,7 @@ class Restricter {
if (!isCorrectFileType) {
const allowedFileTypesString = allowedFileTypes.join(", ");
throw new RestrictionError(
- this.i18n("youCanOnlyUploadFileTypes", {
+ this.getI18n()("youCanOnlyUploadFileTypes", {
types: allowedFileTypesString,
}),
{
@@ -101,7 +103,7 @@ class Restricter {
}
if (maxFileSize && file.size != null && file.size > maxFileSize) {
throw new RestrictionError(
- this.i18n("exceedsSize", {
+ this.getI18n()("exceedsSize", {
size: prettierBytes(maxFileSize),
file: file.name,
}),
@@ -112,7 +114,7 @@ class Restricter {
}
if (minFileSize && file.size != null && file.size < minFileSize) {
throw new RestrictionError(
- this.i18n("inferiorSize", {
+ this.getI18n()("inferiorSize", {
size: prettierBytes(minFileSize),
}),
{
@@ -132,15 +134,19 @@ class Restricter {
minNumberOfFiles,
} = this.getOpts().restrictions;
if (minNumberOfFiles && Object.keys(files).length < minNumberOfFiles) {
- throw new RestrictionError(this.i18n("youHaveToAtLeastSelectX", {
- smart_count: minNumberOfFiles,
- }));
+ throw new RestrictionError(
+ this.getI18n()("youHaveToAtLeastSelectX", {
+ smart_count: minNumberOfFiles,
+ }),
+ );
}
}
getMissingRequiredMetaFields(file) {
- const error = new RestrictionError(this.i18n("missingRequiredMetaFieldOnFile", {
- fileName: file.name,
- }));
+ const error = new RestrictionError(
+ this.getI18n()("missingRequiredMetaFieldOnFile", {
+ fileName: file.name,
+ }),
+ );
const {
requiredMetaFields,
} = this.getOpts().restrictions;
diff --git a/packages/@uppy/core/lib/Uppy.js b/packages/@uppy/core/lib/Uppy.js
index 737172d..0183757 100644
--- a/packages/@uppy/core/lib/Uppy.js
+++ b/packages/@uppy/core/lib/Uppy.js
@@ -209,7 +209,7 @@ export class Uppy {
},
info: [],
});
- _classPrivateFieldLooseBase(this, _restricter)[_restricter] = new Restricter(() => this.opts, this.i18n);
+ _classPrivateFieldLooseBase(this, _restricter)[_restricter] = new Restricter(() => this.opts, () => this.i18n);
_classPrivateFieldLooseBase(this, _storeUnsubscribe)[_storeUnsubscribe] = this.store.subscribe(
(prevState, nextState, patch) => {
this.emit("state-update", prevState, nextState, patch); |
aduh95
approved these changes
Apr 29, 2024
Merged
github-actions bot
added a commit
that referenced
this pull request
Apr 29, 2024
| Package | Version | Package | Version | | ---------------------- | ------- | ---------------------- | ------- | | @uppy/audio | 1.1.9 | @uppy/instagram | 3.3.1 | | @uppy/aws-s3-multipart | 3.11.1 | @uppy/onedrive | 3.3.1 | | @uppy/box | 2.3.1 | @uppy/provider-views | 3.12.0 | | @uppy/companion-client | 3.8.1 | @uppy/react | 3.3.1 | | @uppy/compressor | 1.1.3 | @uppy/status-bar | 3.3.2 | | @uppy/core | 3.11.0 | @uppy/svelte | 3.1.4 | | @uppy/dashboard | 3.8.2 | @uppy/transloadit | 3.6.1 | | @uppy/drop-target | 2.1.0 | @uppy/unsplash | 3.3.1 | | @uppy/dropbox | 3.3.1 | @uppy/url | 3.6.1 | | @uppy/facebook | 3.3.1 | @uppy/utils | 5.9.0 | | @uppy/file-input | 3.1.2 | @uppy/webcam | 3.4.1 | | @uppy/form | 3.2.1 | @uppy/xhr-upload | 3.6.5 | | @uppy/google-drive | 3.5.1 | @uppy/zoom | 2.3.1 | | @uppy/image-editor | 2.4.5 | uppy | 3.25.0 | - meta: enforce use of `.js` extension in `import type` declarations (Antoine du Hamel / #5126) - @uppy/core: add instance ID to generated IDs (Merlijn Vos / #5080) - @uppy/core: reference updated i18n in Restricter (Merlijn Vos / #5118) - @uppy/xhr-upload: refactor to use `fetcher` (Merlijn Vos / #5074) - meta: docs: use StackBlitz for all examples/issue template (Merlijn Vos / #5125) - meta: Update yarn.lock (Murderlon) - @uppy/svelte: Add svelte 5 as peer dep (frederikhors / #5122) - meta: Bump docker/setup-buildx-action from 2 to 3 (dependabot[bot] / #5124) - meta: Bump actions/checkout from 3 to 4 (dependabot[bot] / #5123) - @uppy/dashboard,@uppy/provider-views: Remove JSX global type everywhere (Merlijn Vos / #5117) - @uppy/utils: improve return type of `dataURItoFile` (Antoine du Hamel / #5112) - @uppy/drop-target: change drop event type to DragEvent (Alireza Heydari / #5107) - @uppy/image-editor: fix label definitions (Antoine du Hamel / #5111) - meta: bump Prettier version (Antoine du Hamel / #5114) - @uppy/provider-views: bring back "loaded X files..." (Mikael Finstad / #5097) - @uppy/dashboard: fix type of trigger option (Merlijn Vos / #5106) - meta: fix linter (Antoine du Hamel) - @uppy/form: fix `submitOnSuccess` and `triggerUploadOnSubmit` combination (Merlijn Vos / #5058) - meta: Bump docker/build-push-action from 3 to 5 (dependabot[bot] / #5105) - meta: Bump akhileshns/heroku-deploy from 3.12.12 to 3.13.15 (dependabot[bot] / #5102) - meta: Bump docker/login-action from 2 to 3 (dependabot[bot] / #5101) - meta: Bump actions/download-artifact from 3 to 4 (dependabot[bot]) - meta: Bump actions/upload-artifact from 3 to 4 (dependabot[bot])
github-actions bot
added a commit
that referenced
this pull request
Apr 29, 2024
| Package | Version | Package | Version | | ---------------------- | ------------ | ---------------------- | ------------ | | @uppy/angular | 0.7.0-beta.4 | @uppy/instagram | 4.0.0-beta.4 | | @uppy/audio | 2.0.0-beta.4 | @uppy/onedrive | 4.0.0-beta.4 | | @uppy/aws-s3-multipart | 4.0.0-beta.4 | @uppy/provider-views | 4.0.0-beta.4 | | @uppy/box | 3.0.0-beta.4 | @uppy/react | 4.0.0-beta.4 | | @uppy/companion | 5.0.0-beta.4 | @uppy/status-bar | 4.0.0-beta.4 | | @uppy/companion-client | 4.0.0-beta.4 | @uppy/store-redux | 4.0.0-beta.2 | | @uppy/compressor | 2.0.0-beta.4 | @uppy/svelte | 4.0.0-beta.2 | | @uppy/core | 4.0.0-beta.4 | @uppy/transloadit | 4.0.0-beta.4 | | @uppy/dashboard | 4.0.0-beta.4 | @uppy/unsplash | 4.0.0-beta.4 | | @uppy/drop-target | 3.0.0-beta.4 | @uppy/url | 4.0.0-beta.4 | | @uppy/dropbox | 4.0.0-beta.4 | @uppy/utils | 6.0.0-beta.4 | | @uppy/facebook | 4.0.0-beta.4 | @uppy/webcam | 4.0.0-beta.4 | | @uppy/file-input | 4.0.0-beta.4 | @uppy/xhr-upload | 4.0.0-beta.2 | | @uppy/form | 4.0.0-beta.2 | @uppy/zoom | 3.0.0-beta.4 | | @uppy/google-drive | 4.0.0-beta.4 | uppy | 4.0.0-beta.4 | | @uppy/image-editor | 3.0.0-beta.2 | | | - meta: Upgrade Yarn to 4.x (Merlijn Vos / #4849) - @uppy/utils: fix fetcher export (Murderlon) - @uppy/xhr-upload: refactor to use `fetcher` (Merlijn Vos / #5074) - docs: use StackBlitz for all examples/issue template (Merlijn Vos / #5125) - meta: Update yarn.lock (Murderlon) - @uppy/svelte: Add svelte 5 as peer dep (frederikhors / #5122) - meta: Bump docker/setup-buildx-action from 2 to 3 (dependabot[bot] / #5124) - meta: Bump actions/checkout from 3 to 4 (dependabot[bot] / #5123) - @uppy/dashboard,@uppy/provider-views: Remove JSX global type everywhere (Merlijn Vos / #5117) - @uppy/utils: improve return type of `dataURItoFile` (Antoine du Hamel / #5112) - @uppy/drop-target: change drop event type to DragEvent (Alireza Heydari / #5107) - @uppy/image-editor: fix label definitions (Antoine du Hamel / #5111) - meta: bump Prettier version (Antoine du Hamel / #5114) - @uppy/provider-views: bring back "loaded X files..." (Mikael Finstad / #5097) - @uppy/dashboard: fix type of trigger option (Merlijn Vos / #5106) - meta: fix linter (Antoine du Hamel) - @uppy/companion: bump Node.js version support matrix (Antoine du Hamel / #5035) - @uppy/form: fix `submitOnSuccess` and `triggerUploadOnSubmit` combination (Merlijn Vos / #5058) - meta: Bump docker/build-push-action from 3 to 5 (dependabot[bot] / #5105) - meta: Bump akhileshns/heroku-deploy from 3.12.12 to 3.13.15 (dependabot[bot] / #5102) - meta: Bump docker/login-action from 2 to 3 (dependabot[bot] / #5101) - meta: Bump actions/download-artifact from 3 to 4 (dependabot[bot]) - meta: Bump actions/upload-artifact from 3 to 4 (dependabot[bot]) - @uppy/react: remove `useUppy` & reintroduce `useUppyState` (Merlijn Vos / #5059) - meta: docs: add back markdown files (Antoine du Hamel / #5064) - meta: fix custom provider example (Merlijn Vos / #5079) - @uppy/utils: add fetcher (Merlijn Vos / #5073) - meta: Fix prettier (Murderlon) - @uppy/dashboard: add missing `x-zip-compress` archive type (Younes / #5081) - meta: Bump docker/metadata-action from 4 to 5 (dependabot[bot] / #5086) - meta: Bump actions/setup-node from 3 to 4 (dependabot[bot] / #5087) - meta: Bump docker/setup-qemu-action from 2 to 3 (dependabot[bot] / #5089) - meta: bump supercharge/redis-github-action from 1.4.0 to 1.8.0 (dependabot[bot] / #5090) - meta: bump actions/cache from 3 to 4 (dependabot[bot] / #5088) - meta: add `dependabot.yml` to keep GHA up-to-date (Antoine du Hamel / #5083) - @uppy/core: Release: uppy@3.24.2 (github-actions[bot] / #5084) - @uppy/core: fix `setOptions` not re-rendereing plugin UI (Antoine du Hamel / #5082) - meta: bump vite from 5.0.12 to 5.0.13 (dependabot[bot] / #5060) - meta: bump tar from 6.1.11 to 6.2.1 (dependabot[bot] / #5068) - @uppy/companion,@uppy/file-input: Release: uppy@3.24.1 (github-actions[bot] / #5069) - @uppy/companion: upgrade redis (Mikael Finstad / #5065) - meta: fix `watch:*` scripts (Antoine du Hamel / #5046) - meta: include more packages in `compare_diff` CI (Antoine du Hamel / #5044) - @uppy/file-input: add missing export (Antoine du Hamel / #5045) - meta: Bump express from 4.18.1 to 4.19.2 in /packages/@uppy/companion (dependabot[bot] / #5036) - @uppy/companion: Bump express from 4.18.1 to 4.19.2 (dependabot[bot] / #5037) | Package | Version | Package | Version | | ---------------------- | ------- | ---------------------- | ------- | | @uppy/audio | 1.1.9 | @uppy/instagram | 3.3.1 | | @uppy/aws-s3-multipart | 3.11.1 | @uppy/onedrive | 3.3.1 | | @uppy/box | 2.3.1 | @uppy/provider-views | 3.12.0 | | @uppy/companion-client | 3.8.1 | @uppy/react | 3.3.1 | | @uppy/compressor | 1.1.3 | @uppy/status-bar | 3.3.2 | | @uppy/core | 3.11.0 | @uppy/svelte | 3.1.4 | | @uppy/dashboard | 3.8.2 | @uppy/transloadit | 3.6.1 | | @uppy/drop-target | 2.1.0 | @uppy/unsplash | 3.3.1 | | @uppy/dropbox | 3.3.1 | @uppy/url | 3.6.1 | | @uppy/facebook | 3.3.1 | @uppy/utils | 5.9.0 | | @uppy/file-input | 3.1.2 | @uppy/webcam | 3.4.1 | | @uppy/form | 3.2.1 | @uppy/xhr-upload | 3.6.5 | | @uppy/google-drive | 3.5.1 | @uppy/zoom | 2.3.1 | | @uppy/image-editor | 2.4.5 | uppy | 3.25.0 | - meta: enforce use of `.js` extension in `import type` declarations (Antoine du Hamel / #5126) - @uppy/core: add instance ID to generated IDs (Merlijn Vos / #5080) - @uppy/core: reference updated i18n in Restricter (Merlijn Vos / #5118) - @uppy/xhr-upload: refactor to use `fetcher` (Merlijn Vos / #5074) - meta: docs: use StackBlitz for all examples/issue template (Merlijn Vos / #5125) - meta: Update yarn.lock (Murderlon) - @uppy/svelte: Add svelte 5 as peer dep (frederikhors / #5122) - meta: Bump docker/setup-buildx-action from 2 to 3 (dependabot[bot] / #5124) - meta: Bump actions/checkout from 3 to 4 (dependabot[bot] / #5123) - @uppy/dashboard,@uppy/provider-views: Remove JSX global type everywhere (Merlijn Vos / #5117) - @uppy/utils: improve return type of `dataURItoFile` (Antoine du Hamel / #5112) - @uppy/drop-target: change drop event type to DragEvent (Alireza Heydari / #5107) - @uppy/image-editor: fix label definitions (Antoine du Hamel / #5111) - meta: bump Prettier version (Antoine du Hamel / #5114) - @uppy/provider-views: bring back "loaded X files..." (Mikael Finstad / #5097) - @uppy/dashboard: fix type of trigger option (Merlijn Vos / #5106) - meta: fix linter (Antoine du Hamel) - @uppy/form: fix `submitOnSuccess` and `triggerUploadOnSubmit` combination (Merlijn Vos / #5058) - meta: Bump docker/build-push-action from 3 to 5 (dependabot[bot] / #5105) - meta: Bump akhileshns/heroku-deploy from 3.12.12 to 3.13.15 (dependabot[bot] / #5102) - meta: Bump docker/login-action from 2 to 3 (dependabot[bot] / #5101) - meta: Bump actions/download-artifact from 3 to 4 (dependabot[bot]) - meta: Bump actions/upload-artifact from 3 to 4 (dependabot[bot])
Murderlon
added a commit
that referenced
this pull request
May 2, 2024
* main: meta: enable prettier for markdown (#5133) @uppy/xhr-upload: do not throw when res is missing url (#5132) @uppy/companion: coerce `requestUrl` to a string (#5128) Release: uppy@3.25.0 (#5127) meta: enforce use of `.js` extension in `import type` declarations (#5126) @uppy/core: add instance ID to generated IDs (#5080) @uppy/core: reference updated i18n in Restricter (#5118)
Murderlon
added a commit
that referenced
this pull request
May 2, 2024
* 4.x: meta: enable prettier for markdown (#5133) @uppy/xhr-upload: do not throw when res is missing url (#5132) Release: uppy@4.0.0-beta.4 (#5130) meta: fix release script Upgrade Yarn to 4.x (#4849) @uppy/companion: coerce `requestUrl` to a string (#5128) Release: uppy@3.25.0 (#5127) meta: enforce use of `.js` extension in `import type` declarations (#5126) @uppy/core: add instance ID to generated IDs (#5080) @uppy/core: reference updated i18n in Restricter (#5118)
This was referenced May 3, 2024
github-actions bot
added a commit
that referenced
this pull request
May 3, 2024
| Package | Version | Package | Version | | ------------------------- | ------------ | ------------------------- | ------------ | | @uppy/audio | 2.0.0-beta.5 | @uppy/progress-bar | 4.0.0-beta.4 | | @uppy/aws-s3 | 4.0.0-beta.3 | @uppy/provider-views | 4.0.0-beta.5 | | @uppy/aws-s3-multipart | 4.0.0-beta.5 | @uppy/react | 4.0.0-beta.5 | | @uppy/box | 3.0.0-beta.5 | @uppy/redux-dev-tools | 4.0.0-beta.2 | | @uppy/companion | 5.0.0-beta.5 | @uppy/remote-sources | 2.0.0-beta.4 | | @uppy/companion-client | 4.0.0-beta.5 | @uppy/screen-capture | 4.0.0-beta.4 | | @uppy/compressor | 2.0.0-beta.5 | @uppy/status-bar | 4.0.0-beta.5 | | @uppy/core | 4.0.0-beta.5 | @uppy/store-default | 4.0.0-beta.2 | | @uppy/dashboard | 4.0.0-beta.5 | @uppy/store-redux | 4.0.0-beta.3 | | @uppy/drag-drop | 4.0.0-beta.4 | @uppy/svelte | 4.0.0-beta.3 | | @uppy/dropbox | 4.0.0-beta.5 | @uppy/thumbnail-generator | 4.0.0-beta.4 | | @uppy/facebook | 4.0.0-beta.5 | @uppy/transloadit | 4.0.0-beta.5 | | @uppy/file-input | 4.0.0-beta.5 | @uppy/tus | 4.0.0-beta.4 | | @uppy/form | 4.0.0-beta.3 | @uppy/unsplash | 4.0.0-beta.5 | | @uppy/golden-retriever | 4.0.0-beta.4 | @uppy/url | 4.0.0-beta.5 | | @uppy/google-drive | 4.0.0-beta.5 | @uppy/utils | 6.0.0-beta.5 | | @uppy/image-editor | 3.0.0-beta.3 | @uppy/vue | 2.0.0-beta.2 | | @uppy/informer | 4.0.0-beta.2 | @uppy/webcam | 4.0.0-beta.5 | | @uppy/instagram | 4.0.0-beta.5 | @uppy/xhr-upload | 4.0.0-beta.3 | | @uppy/locales | 4.0.0-beta.1 | @uppy/zoom | 3.0.0-beta.5 | | @uppy/onedrive | 4.0.0-beta.5 | uppy | 4.0.0-beta.5 | - @uppy/core: make UppyEventMap more readable (Murderlon) - @uppy/audio,@uppy/compressor,@uppy/core,@uppy/dashboard,@uppy/remote-sources,@uppy/tus,@uppy/utils: Format (Murderlon) - @uppy/aws-s3-multipart: Format (Murderlon) - meta: enable prettier for markdown (Merlijn Vos / #5133) - @uppy/xhr-upload: do not throw when res is missing url (Merlijn Vos / #5132) - @uppy/companion: coerce `requestUrl` to a string (Antoine du Hamel / #5128) - meta: enforce use of `.js` extension in `import type` declarations (Antoine du Hamel / #5126) - @uppy/core: add instance ID to generated IDs (Merlijn Vos / #5080) - @uppy/core: reference updated i18n in Restricter (Merlijn Vos / #5118)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #5115
The code isn't pretty and in hindsight I regret making
Restrictera class rather than just a series of functions outside of core. But it is what it is now.