Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix locale-pack for en_US #5431

Merged
merged 6 commits into from
Aug 29, 2024
Merged

Fix locale-pack for en_US #5431

merged 6 commits into from
Aug 29, 2024

Conversation

Murderlon
Copy link
Member

I was wondering why my locale changes don't show up locally. Turns out we use the Uppy CDN bundle in our dev setup with does not have @uppy/locales. Then it still didn't work and it turns out the script was broken since the TS migration.

@Murderlon Murderlon requested review from mifi and aduh95 August 28, 2024 10:10
@Murderlon Murderlon self-assigned this Aug 28, 2024
Copy link
Contributor

github-actions bot commented Aug 28, 2024

Diff output files
diff --git a/packages/@uppy/locales/lib/en_US.js b/packages/@uppy/locales/lib/en_US.js
index bea53cc..a10ca17 100644
--- a/packages/@uppy/locales/lib/en_US.js
+++ b/packages/@uppy/locales/lib/en_US.js
@@ -1,7 +1,7 @@
 const en_US = {
   strings: {},
-  pluralize(count) {
-    if (count === 1) {
+  pluralize(n) {
+    if (n === 1) {
       return 0;
     }
     return 1;
@@ -17,6 +17,7 @@ en_US.strings = {
   additionalRestrictionsFailed: "%{count} additional restrictions were not fulfilled",
   addMore: "Add more",
   addMoreFiles: "Add more files",
+  aggregateExceedsSize: "You selected %{size} of files, but maximum allowed size is %{sizeAllowed}",
   allFilesFromFolderNamed: "All files from folder %{name}",
   allowAccessDescription:
     "In order to take pictures or record video with your camera, please allow camera access for this site.",
@@ -62,8 +63,8 @@ en_US.strings = {
   dropPasteImportFiles: "Drop files here, %{browseFiles} or import from:",
   dropPasteImportFolders: "Drop files here, %{browseFolders} or import from:",
   editFile: "Edit file",
-  editImage: "Edit image",
   editFileWithFilename: "Edit file %{file}",
+  editImage: "Edit image",
   editing: "Editing %{file}",
   emptyFolderAdded: "No files were added from empty folder",
   encoding: "Encoding...",
@@ -80,7 +81,7 @@ en_US.strings = {
   },
   filter: "Filter",
   finishEditingFile: "Finish editing file",
-  flipHorizontal: "Flip horizontal",
+  flipHorizontal: "Flip horizontally",
   folderAdded: {
     "0": "Added %{smart_count} file from %{folder}",
     "1": "Added %{smart_count} files from %{folder}",
@@ -121,8 +122,12 @@ en_US.strings = {
   pluginNameDropbox: "Dropbox",
   pluginNameFacebook: "Facebook",
   pluginNameGoogleDrive: "Google Drive",
+  pluginNameGooglePhotos: "Google Photos",
   pluginNameInstagram: "Instagram",
   pluginNameOneDrive: "OneDrive",
+  pluginNameScreenCapture: "Screencast",
+  pluginNameUnsplash: "Unsplash",
+  pluginNameUrl: "Link",
   pluginNameZoom: "Zoom",
   poweredBy: "Powered by %{uppy}",
   processingXFiles: {
@@ -146,8 +151,8 @@ en_US.strings = {
   resumeUpload: "Resume upload",
   retry: "Retry",
   retryUpload: "Retry upload",
-  revert: "Revert",
-  rotate: "Rotate",
+  revert: "Reset",
+  rotate: "Rotate 90°",
   save: "Save",
   saveChanges: "Save changes",
   search: "Search",
@@ -171,7 +176,7 @@ en_US.strings = {
   submitRecordedFile: "Submit recorded file",
   takePicture: "Take a picture",
   takePictureBtn: "Take Picture",
-  timedOut: "Upload stalled for %{seconds} seconds, aborting.",
+  unnamed: "Unnamed",
   upload: "Upload",
   uploadComplete: "Upload complete",
   uploadFailed: "Upload failed",
@@ -211,4 +216,7 @@ en_US.strings = {
   zoomIn: "Zoom in",
   zoomOut: "Zoom out",
 };
+if (typeof Uppy !== "undefined") {
+  globalThis.Uppy.locales.en_US = en_US;
+}
 export default en_US;

private/dev/package.json Outdated Show resolved Hide resolved
@Murderlon Murderlon merged commit a750140 into main Aug 29, 2024
17 checks passed
@Murderlon Murderlon deleted the locale-pack-fix branch August 29, 2024 07:44
github-actions bot added a commit that referenced this pull request Aug 29, 2024
| Package                | Version | Package                | Version |
| ---------------------- | ------- | ---------------------- | ------- |
| @uppy/aws-s3           |   4.1.0 | @uppy/informer         |   4.1.0 |
| @uppy/box              |   3.1.0 | @uppy/instagram        |   4.1.0 |
| @uppy/companion        |   5.1.0 | @uppy/locales          |   4.1.0 |
| @uppy/companion-client |   4.1.0 | @uppy/onedrive         |   4.1.0 |
| @uppy/compressor       |   2.1.0 | @uppy/remote-sources   |   2.2.0 |
| @uppy/core             |   4.2.0 | @uppy/screen-capture   |   4.1.0 |
| @uppy/dashboard        |   4.1.0 | @uppy/tus              |   4.1.0 |
| @uppy/dropbox          |   4.1.0 | @uppy/unsplash         |   4.1.0 |
| @uppy/facebook         |   4.1.0 | @uppy/url              |   4.1.0 |
| @uppy/google-drive     |   4.1.0 | @uppy/xhr-upload       |   4.1.0 |
| @uppy/google-photos    |   0.3.0 | @uppy/zoom             |   3.1.0 |
| @uppy/image-editor     |   3.1.0 | uppy                   |   4.3.0 |

- @uppy/core,@uppy/dashboard: Pass container to `UIPlugin.render` for non-Preact integration (Merlijn Vos / #5437)
- @uppy/companion: do not use unsafe call to `JSON.stringify` (Antoine du Hamel / #5422)
- meta: Fix yarn.lock (Murderlon)
- @uppy/locales: Fix locale-pack for en_US (Merlijn Vos / #5431)
- meta: Add tsconfig to packages in private/ (Merlijn Vos / #5432)
- @uppy/remote-sources: support companionKeysParams (Merlijn Vos / #5434)
- @uppy/aws-s3,@uppy/box,@uppy/compressor,@uppy/dropbox,@uppy/facebook,@uppy/google-drive,@uppy/google-photos,@uppy/image-editor,@uppy/informer,@uppy/instagram,@uppy/onedrive,@uppy/screen-capture,@uppy/tus,@uppy/unsplash,@uppy/url,@uppy/xhr-upload,@uppy/zoom: export plugin options (Antoine du Hamel / #5433)
- docs: correctly list exported components (Merlijn Vos / #5417)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants