From 0c701cc1d02c3d3b630050a0547f9dc632596013 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Tue, 9 May 2017 16:00:40 -0400
Subject: 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
---
 webapp/components/root.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'webapp/components/root.jsx')

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() {
-- 
cgit v1.2.3-1-g7c22