Fixed game always loading in English after page refresh

marc-ed-raffalli · Feb 2, 2018 · c1d7e26 · c1d7e26
1 parent d8b2b98
commit c1d7e26
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/containers/LocalizedRoute.js b/src/containers/LocalizedRoute.js
@@ -40,8 +40,12 @@ class LocalizedRoute extends Component {
 
   setLocale(locale) {
     if (locale && locale !== this.state.currentLocale && isLocaleSupported(locale)) {
-      this.setState(() => ({currentLocale: locale}));
-      this.props.setLocale(locale);
+      this.props.setLocale(locale)
+        .then(() => {
+          // only set the locale after it is loaded
+          // fix for game loading in en after page refresh
+          this.setState(() => ({currentLocale: locale}));
+        });
     }
   }
 
@@ -86,13 +90,12 @@ const mapDispatchToProps = dispatch => ({
   initializeLocalization: () => {
     dispatch(initialize(supportedGameLocales));
   },
-  setLocale: (locale) => {
+  setLocale: locale =>
     getTranslation(locale)
       .then(translations => {
         dispatch(addTranslationForLanguage(translations, locale));
         dispatch(setActiveLanguage(locale));
-      });
-  }
+      })
 });
 
 export default connect(