Merge branch 'release-v1.3.2'

opencrvs · Jan 19, 2024 · 7284c3e · 7284c3e
2 parents eb7d3c6 + c437389
commit 7284c3e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/packages/client/src/i18n/reducer.ts b/packages/client/src/i18n/reducer.ts
@@ -164,14 +164,19 @@ export const intlReducer: LoopReducer<IntlState, any> = (
   switch (action.type) {
     case actions.CHANGE_LANGUAGE:
       const messages = getNextMessages(action.payload.language, state.languages)
+      let language = action.payload.language
+
+      if (!state.languages[language]) {
+        language = getDefaultLanguage()
+      }
 
       return loop(
         {
           ...state,
-          language: action.payload.language,
+          language,
           messages
         },
-        Cmd.run(() => storeLanguage(action.payload.language))
+        Cmd.run(() => storeLanguage(language))
       )
 
     case offlineActions.READY:

diff --git a/packages/login/src/i18n/reducer.ts b/packages/login/src/i18n/reducer.ts
@@ -124,14 +124,19 @@ export const intlReducer: LoopReducer<IntlState, any> = (
       }
     case actions.CHANGE_LANGUAGE:
       const messages = getNextMessages(action.payload.language, state.languages)
+      let language = action.payload.language
+
+      if (!state.languages[language]) {
+        language = getDefaultLanguage()
+      }
 
       return loop(
         {
           ...state,
-          language: action.payload.language,
+          language,
           messages
         },
-        Cmd.run(() => storeLanguage(action.payload.language))
+        Cmd.run(() => storeLanguage(language))
       )
     default:
       return state