Skip to content

Commit

Permalink
fix(timeline): custom locales does not work (#187) (#188)
Browse files Browse the repository at this point in the history
  • Loading branch information
ryamaguchi0220 authored and yotamberk committed Nov 16, 2019
1 parent 92808db commit 790ebe0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion lib/timeline/component/CurrentTime.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class CurrentTime extends Component {
};
this.options = util.extend({}, this.defaultOptions);
this.setOptions(options);
util.extend(this.options.locales, locales, this.options.locales);
this.options.locales = util.extend({}, locales, this.options.locales);
const defaultLocales = this.defaultOptions.locales[this.defaultOptions.locale];
Object.keys(this.options.locales).forEach(locale => {
this.options.locales[locale] = util.extend(
Expand Down
2 changes: 1 addition & 1 deletion lib/timeline/component/CustomTime.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class CustomTime extends Component {
};
this.options = util.extend({}, this.defaultOptions);
this.setOptions(options);
util.extend(this.options.locales, locales, this.options.locales);
this.options.locales = util.extend({}, locales, this.options.locales);
const defaultLocales = this.defaultOptions.locales[this.defaultOptions.locale];
Object.keys(this.options.locales).forEach(locale => {
this.options.locales[locale] = util.extend(
Expand Down
2 changes: 1 addition & 1 deletion lib/timeline/component/item/Item.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class Item {
locale: 'en'
};
this.options = util.extend({}, this.defaultOptions, options);
util.extend(this.options.locales, locales, this.options.locales);
this.options.locales = util.extend({}, locales, this.options.locales);
const defaultLocales = this.defaultOptions.locales[this.defaultOptions.locale];
Object.keys(this.options.locales).forEach(locale => {
this.options.locales[locale] = util.extend(
Expand Down

0 comments on commit 790ebe0

Please sign in to comment.