feat: reload i18n without window.location.reload (#67)

decentraland · Mar 9, 2020 · 9815605 · 9815605
1 parent 41681ba
commit 9815605
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/modules/translation/sagas.ts b/src/modules/translation/sagas.ts
@@ -5,7 +5,6 @@ import {
   fetchTranslationsSuccess,
   fetchTranslationsFailure,
   FETCH_TRANSLATIONS_REQUEST,
-  CHANGE_LOCALE,
   FetchTranslationsRequestAction
 } from './actions'
 import { setCurrentLocale, mergeTranslations } from './utils'
@@ -29,15 +28,15 @@ export function createTranslationSaga({
       if (getTranslation) {
         result = yield call(() => getTranslation(locale))
       } else if (translations) {
-        result = flatten(translations[locale])
+        result = translations[locale]
       } else {
         throw new Error('You must provide `translations` or `getTranslations`')
       }
 
       // merge translations and defaults
       result = mergeTranslations<TranslationKeys>(
         flatten(defaultTranslations[locale]),
-        result
+        flatten(result)
       )
 
       setCurrentLocale(locale, result)
@@ -48,12 +47,7 @@ export function createTranslationSaga({
     }
   }
 
-  function handleChangeLocale() {
-    window.location.reload()
-  }
-
   return function* translationSaga() {
     yield takeEvery(FETCH_TRANSLATIONS_REQUEST, handleFetchTranslationsRequest)
-    yield takeEvery(CHANGE_LOCALE, handleChangeLocale)
   }
 }
diff --git a/src/providers/TranslationProvider/TranslationProvider.tsx b/src/providers/TranslationProvider/TranslationProvider.tsx
@@ -21,7 +21,7 @@ export default class TranslationProvider extends React.PureComponent<Props> {
     const { children, locale, translations } = this.props
 
     return translations && locale ? (
-      <I18nProvider locale={locale} messages={translations}>
+      <I18nProvider key={locale} locale={locale} messages={translations}>
         {children}
       </I18nProvider>
     ) : (