|
@@ -125,17 +125,15 @@ module.exports = class Dashboard extends Plugin {
|
|
|
proudlyDisplayPoweredByUppy: true,
|
|
|
onRequestCloseModal: () => this.closeModal(),
|
|
|
showSelectedFiles: true,
|
|
|
- locale: defaultLocale,
|
|
|
+ // locale: defaultLocale,
|
|
|
browserBackButtonClose: false
|
|
|
}
|
|
|
|
|
|
// merge default options with the ones set by user
|
|
|
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.translator = new Translator({locale: this.locale})
|
|
|
+ // i18n
|
|
|
+ this.translator = new Translator([ defaultLocale, this.uppy.locale, this.opts.locale ])
|
|
|
this.i18n = this.translator.translate.bind(this.translator)
|
|
|
this.i18nArray = this.translator.translateArray.bind(this.translator)
|
|
|
|