@beinformed/ui 1.62.7 → 1.62.8

package/src/redux/_i18n/I18nReducer.js

@@ -1,6 +1,6 @@
 // @flow
 import Cache from "../../utils/browser/Cache";
-import { setCookie } from "../../utils/browser/Cookies";
+import { setCookie, clearCookie } from "../../utils/browser/Cookies";
 
 import Locales from "../../i18n/Locales";
 
@@ -12,7 +12,11 @@ import type { ReduxAction } from "../types";
  */
 const updateLocale = (state: I18nState, locale: string) => {
   // set locale in cookie
-  setCookie("locale", locale);
+  if (state.locales?.length > 1) {
+    setCookie("locale", locale);
+  } else {
+    clearCookie("locale");
+  }
 
   // clear cache because of cached contributions
   Cache.clear();
@@ -30,7 +34,11 @@ const setLocales = (
   { locale, locales }: { locale: string, locales: Locales },
 ) => {
   // set locale in cookie
-  setCookie("locale", locale);
+  if (state.locales.length > 1) {
+    setCookie("locale", locale);
+  } else {
+    clearCookie("locale");
+  }
 
   if (locale) {
     return {

package/src/redux/reducers/createReducer.js

@@ -42,6 +42,7 @@ type Reducers = {
 /**
  */
 export const createReducer = (): Reducers => ({
+  preferences: PreferencesReducer,
   router: RouterReducer,
   modularui: ModularUIReducer,
   i18n: I18nReducer,
@@ -51,5 +52,4 @@ export const createReducer = (): Reducers => ({
   modelcatalog: ModelCatalogReducer,
   notification: NotificationReducer,
   progressindicator: ProgressIndicatorReducer,
-  preferences: PreferencesReducer,
 });

package/src/redux/store/configureStore.js

@@ -13,8 +13,6 @@ import { modularUIMiddleware } from "../_modularui/ModularUIMiddleware";
 import { createReducer } from "../reducers/createReducer";
 import { locationChange } from "../_router/RouterActions";
 
-import { updateLocale } from "../_i18n/I18nActions";
-
 import type { RouterHistory } from "react-router";
 import type { ReduxAction, ReduxState, ReduxStore } from "../types";
 import type { Reducer } from "redux";
@@ -55,11 +53,6 @@ const configureStore = (
     store.dispatch(locationChange(routerHistory.location, "PUSH"));
   }
 
-  const locale = initialState?.i18n.locale;
-  if (locale) {
-    store.dispatch(updateLocale(locale));
-  }
-
   return { routerHistory, store };
 };
 

package/src/utils/datetime/DateTimeUtil.js

@@ -25,6 +25,7 @@ import {
   DATETIME_OFFSET_FORMAT,
   DEFAULT_FIRST_WEEK_CONTAINS_DATE,
   DEFAULT_WEEK_STARTS_ON,
+  getEnabledLocales,
   getSetting,
   IS_GRAALJS,
   isIncludeTimeOffsetInDateTimes,
@@ -136,7 +137,8 @@ class BaseDateTimeUtil {
   /**
    */
   getLocale(): typeof nl | typeof enGB {
-    const locale = getCookie("locale") ?? "en";
+    const defaultLocale = getEnabledLocales()[0];
+    const locale = getCookie("locale") ?? defaultLocale ?? "en";
 
     if (locale === "nl") {
       return nl;