Prevented router components from sworking twice

erxes · Aug 26, 2018 · 3c7b6df · 3c7b6df
1 parent 461a157
commit 3c7b6df
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/modules/layout/containers/MainLayout.js b/src/modules/layout/containers/MainLayout.js
@@ -67,11 +67,14 @@ class MainLayoutContainer extends React.Component {
   constructor(props) {
     super(props);
 
-    this.state = {
-      currentLanguage: 'en'
-    };
+    // initiliaze locale ======
+    const currentLanguage = localStorage.getItem('currentLanguage') || 'en';
 
+    this.state = { currentLanguage };
+    this.setLocale = this.setLocale.bind(this);
     this.changeLanguage = this.changeLanguage.bind(this);
+
+    this.setLocale(currentLanguage);
   }
 
   getChildContext() {
@@ -81,18 +84,17 @@ class MainLayoutContainer extends React.Component {
     };
   }
 
-  componentDidMount() {
-    this.changeLanguage(localStorage.getItem('currentLanguage'));
+  setLocale(currentLanguage) {
+    moment.locale(currentLanguage);
+    T.setTexts(translations[currentLanguage]);
   }
 
   changeLanguage(languageCode) {
     const currentLanguage = languageCode || 'en';
 
     localStorage.setItem('currentLanguage', currentLanguage);
 
-    moment.locale(currentLanguage);
-
-    T.setTexts(translations[currentLanguage]);
+    this.setLocale(currentLanguage);
 
     this.setState({ currentLanguage });
   }