Mirrors/uppy
1
0
Fork 0
mirror of https://github.com/transloadit/uppy.git synced 2026-07-25 11:14:05 +00:00
Code Issues Projects Releases Wiki Activity

Object rest spread

Browse source
This commit is contained in:
Renée Kooi 2018-10-08 12:46:29 +02:00
parent cd71bc48b3
commit 0f4f7dffff
No known key found for this signature in database
GPG key ID: 8CDD5F0BC448F040
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
packages/@uppy/aws-s3/src/index.js
View file

@ -39,9 +39,12 @@ module.exports = class AwsS3 extends Plugin {
locale: defaultLocale
}
this.opts = Object.assign({}, defaultOptions, opts)
this.locale = Object.assign({}, defaultLocale, this.opts.locale)
this.locale.strings = Object.assign({}, defaultLocale.strings, this.opts.locale.strings)
this.opts = { ...defaultOptions, ...opts }
this.locale = {
...defaultLocale,
...this.opts.locale,
strings: { ...defaultLocale.strings, ...this.opts.locale.strings }
}
this.translator = new Translator({ locale: this.locale })
this.i18n = this.translator.translate.bind(this.translator)