diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-05-09 16:00:40 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-05-09 16:00:40 -0400 |
| commit | 0c701cc1d02c3d3b630050a0547f9dc632596013 (patch) | |
| tree | b26324ebe2457d5cc8f8547513c053add166fc3c /webapp/components/root.jsx | |
| parent | e52ab9737ed4043b5c6236561939d50a8588b349 (diff) | |
| download | chat-0c701cc1d02c3d3b630050a0547f9dc632596013.tar.gz chat-0c701cc1d02c3d3b630050a0547f9dc632596013.tar.bz2 chat-0c701cc1d02c3d3b630050a0547f9dc632596013.zip | |
PLT-6518 Fixed user's locale not being loaded with redux actions (#6359)
* Stopped ManageLanguages component from mutating user
* Removed obsolete reference to mm_user
* PLT-6518 Fixed user's locale not being loaded with redux actions
Diffstat (limited to 'webapp/components/root.jsx')
| -rw-r--r-- | webapp/components/root.jsx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webapp/components/root.jsx b/webapp/components/root.jsx index 6907e84e4..701ee6e80 100644 --- a/webapp/components/root.jsx +++ b/webapp/components/root.jsx @@ -20,8 +20,8 @@ export default class Root extends React.Component { constructor(props) { super(props); this.state = { - locale: 'en', - translations: null + locale: LocalizationStore.getLocale(), + translations: LocalizationStore.getTranslations() }; this.localizationChanged = this.localizationChanged.bind(this); @@ -113,7 +113,7 @@ export default class Root extends React.Component { LocalizationStore.addChangeListener(this.localizationChanged); // Get our localizaiton - GlobalActions.loadDefaultLocale(); + GlobalActions.loadCurrentLocale(); } componentWillUnmount() { |