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 Google Picker plugins locale #5575

Merged
merged 1 commit into from
Jan 6, 2025
Merged

Fix Google Picker plugins locale #5575

merged 1 commit into from
Jan 6, 2025

Conversation

Murderlon
Copy link
Member

@Murderlon Murderlon commented Jan 6, 2025

Fixes #5542

@Murderlon Murderlon requested a review from mifi January 6, 2025 14:14
@Murderlon Murderlon self-assigned this Jan 6, 2025
Copy link
Contributor

github-actions bot commented Jan 6, 2025

Diff output files
diff --git a/packages/@uppy/google-drive-picker/lib/GoogleDrivePicker.js b/packages/@uppy/google-drive-picker/lib/GoogleDrivePicker.js
index a5c9e75..1b3b191 100644
--- a/packages/@uppy/google-drive-picker/lib/GoogleDrivePicker.js
+++ b/packages/@uppy/google-drive-picker/lib/GoogleDrivePicker.js
@@ -55,6 +55,7 @@ export default class GoogleDrivePicker extends UIPlugin {
       });
     this.id = this.opts.id || "GoogleDrivePicker";
     this.storage = this.opts.storage || tokenStorage;
+    this.defaultLocale = locale;
     this.i18nInit();
     this.title = this.i18n("pluginNameGoogleDrive");
     const client = new RequestClient(uppy, {
diff --git a/packages/@uppy/google-photos-picker/lib/GooglePhotosPicker.js b/packages/@uppy/google-photos-picker/lib/GooglePhotosPicker.js
index ad26dc7..28ad94d 100644
--- a/packages/@uppy/google-photos-picker/lib/GooglePhotosPicker.js
+++ b/packages/@uppy/google-photos-picker/lib/GooglePhotosPicker.js
@@ -53,6 +53,7 @@ export default class GooglePhotosPicker extends UIPlugin {
       });
     this.id = this.opts.id || "GooglePhotosPicker";
     this.storage = this.opts.storage || tokenStorage;
+    this.defaultLocale = locale;
     this.i18nInit();
     this.title = this.i18n("pluginNameGooglePhotos");
     const client = new RequestClient(uppy, {

@Murderlon Murderlon merged commit d378791 into main Jan 6, 2025
16 checks passed
@Murderlon Murderlon deleted the google-picker-locale branch January 6, 2025 16:03
github-actions bot added a commit that referenced this pull request Jan 8, 2025
| Package                    | Version | Package                    | Version |
| -------------------------- | ------- | -------------------------- | ------- |
| @uppy/google-drive-picker  |   0.3.1 | @uppy/unsplash             |   4.3.0 |
| @uppy/google-photos-picker |   0.3.1 | @uppy/utils                |   6.1.1 |
| @uppy/onedrive             |   4.2.1 | @uppy/xhr-upload           |   4.3.1 |
| @uppy/provider-views       |   4.4.0 | uppy                       |  4.12.0 |
| @uppy/svelte               |   4.3.0 |                            |         |

- @uppy/unsplash,@uppy/provider-views: add utmSource option (Merlijn Vos / #5580)
- @uppy/xhr-upload: allow custom error message in onAfterResponse (Merlijn Vos / #5578)
- @uppy/onedrive: fix AsyncStore import (Merlijn Vos / #5579)
- @uppy/google-drive-picker,@uppy/google-photos-picker: Fix Google Picker plugins locale (Merlijn Vos / #5575)
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.

Error: missing string: pluginNameGoogleDrive + pluginNameGooglePhotos
2 participants