@configuratorware/configurator-frontendgui 1.49.4 → 1.49.6

package/App/configuration.js

@@ -358,47 +358,63 @@ function setConfiguration(customApplicationConfiguration) {
 }
 function setLanguage() {
   var language;
-  // if the default language is defined in the configuration
-  if (applicationConfiguration.language) {
-    language = applicationConfiguration.language;
-  }
-  // if there is a locales array in the configuration...
-  else if (applicationConfiguration.locales) {
-    var browserLanguage = (0, _get["default"])(navigator, 'languages[0]', navigator.language).replace('-', '_');
-    var matchToBrowserLanguage = (0, _find["default"])(applicationConfiguration.locales, {
-      code: browserLanguage
-    });
-    var preferred = (0, _find["default"])(applicationConfiguration.locales, {
-      preferred: true
-    });
+  //fetch default language and set
+  _Api["default"].request({
+    url: 'languages'
+  }).then(function (response) {
+    var _response$data$find;
+    language = (_response$data$find = response.data.find(function (lang) {
+      return lang.isDefault;
+    })) === null || _response$data$find === void 0 ? void 0 : _response$data$find.iso;
+    // if the default language is defined in the configuration
+    if (applicationConfiguration.language) {
+      language = applicationConfiguration.language;
+    } else if (!language) {
+      // if there is a locales array in the configuration...
+      if (applicationConfiguration.locales) {
+        var browserLanguage = (0, _get["default"])(navigator, 'languages[0]', navigator.language).replace('-', '_');
+        var matchToBrowserLanguage = (0, _find["default"])(applicationConfiguration.locales, {
+          code: browserLanguage
+        });
+        var preferred = (0, _find["default"])(applicationConfiguration.locales, {
+          preferred: true
+        });
 
-    // if there is a match with the browser language use that
-    if (matchToBrowserLanguage) {
-      language = matchToBrowserLanguage.code;
-    }
-    // if the preferred language is set use it
-    else if (preferred) {
-      language = preferred.code;
+        // if there is a match with the browser language use that
+        if (matchToBrowserLanguage) {
+          language = matchToBrowserLanguage.code;
+        }
+        // if the preferred language is set use it
+        else if (preferred) {
+          language = preferred.code;
+        }
+        // otherwise use the first from the locales list
+        else {
+          language = (0, _first["default"])(applicationConfiguration.locales).code;
+        }
+      }
+      // we have no info about the language, so try to use the browser language
+      else {
+        language = (0, _get["default"])(navigator, 'languages[0]', navigator.language).replace('-', '_') || 'de_DE';
+      }
     }
-    // otherwise use the first from the locales list
-    else {
-      language = (0, _first["default"])(applicationConfiguration.locales).code;
+    if (!(0, _find["default"])(applicationConfiguration.locales, {
+      code: language.replace('-', '_')
+    })) {
+      // eslint-disable-next-line no-console
+      console.warn("The selected language (".concat(language, ") is not listed in the available languages!"));
+      language = (0, _find["default"])(applicationConfiguration.locales, {
+        preferred: true
+      }).code;
     }
-  }
-  // we have no info about the language, so try to use the browser language
-  else {
-    language = (0, _get["default"])(navigator, 'languages[0]', navigator.language).replace('-', '_') || 'de_DE';
-  }
-  if (!(0, _find["default"])(applicationConfiguration.locales, {
-    code: language
-  })) {
+    applicationConfiguration.language = language.replace('_', '-');
+    _Api["default"].setLanguage(applicationConfiguration.language);
+    document.documentElement.lang = language.substring(0, 2);
+    (0, _Translations.initLanguage)(applicationConfiguration.language, applicationConfiguration.network.baseURL);
+  })["catch"](function (error) {
     // eslint-disable-next-line no-console
-    console.warn("The selected language (".concat(language, ") is not listed in the available languages!"));
-  }
-  applicationConfiguration.language = language.replace('_', '-');
-  _Api["default"].setLanguage(applicationConfiguration.language);
-  document.documentElement.lang = language.substring(0, 2);
-  (0, _Translations.initLanguage)(applicationConfiguration.language, applicationConfiguration.network.baseURL);
+    console.error('Error by loading api default language!', error);
+  });
 }
 
 // backward compatibility alias

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@configuratorware/configurator-frontendgui",
-  "version": "1.49.4",
+  "version": "1.49.6",
   "license": "UNLICENSED",
   "private": false,
   "main": "./index.js",
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "@configuratorware/scripts": "1.49.4",
+    "@configuratorware/scripts": "1.49.6",
     "@material-ui/core": "^4.12.4",
     "@material-ui/icons": "^4.11.3",
     "@material-ui/lab": "^4.0.0-alpha.61",
@@ -36,8 +36,8 @@
     "react-router-dom": "^5.3.4",
     "react-swipeable": "^5.5.1",
     "react-zoom-pan-pinch": "^2.1.3",
-    "redhotmagma-graphics-editor": "1.49.4",
-    "redhotmagma-visualization": "1.49.4",
+    "redhotmagma-graphics-editor": "1.49.6",
+    "redhotmagma-visualization": "1.49.6",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",

package/src/App/configuration.js

@@ -404,41 +404,67 @@ export function setConfiguration(customApplicationConfiguration) {
 
 function setLanguage() {
     let language;
-    // if the default language is defined in the configuration
-    if (applicationConfiguration.language) {
-        language = applicationConfiguration.language;
-    }
-    // if there is a locales array in the configuration...
-    else if (applicationConfiguration.locales) {
-        const browserLanguage = get(navigator, 'languages[0]', navigator.language).replace('-', '_');
-        const matchToBrowserLanguage = find(applicationConfiguration.locales, { code: browserLanguage });
-        const preferred = find(applicationConfiguration.locales, { preferred: true });
-
-        // if there is a match with the browser language use that
-        if (matchToBrowserLanguage) {
-            language = matchToBrowserLanguage.code;
-        }
-        // if the preferred language is set use it
-        else if (preferred) {
-            language = preferred.code;
-        }
-        // otherwise use the first from the locales list
-        else {
-            language = first(applicationConfiguration.locales).code;
-        }
-    }
-    // we have no info about the language, so try to use the browser language
-    else {
-        language = get(navigator, 'languages[0]', navigator.language).replace('-', '_') || 'de_DE';
-    }
-    if (!find(applicationConfiguration.locales, { code: language })) {
-        // eslint-disable-next-line no-console
-        console.warn(`The selected language (${language}) is not listed in the available languages!`);
-    }
-    applicationConfiguration.language = language.replace('_', '-');
-    Api.setLanguage(applicationConfiguration.language);
-    document.documentElement.lang = language.substring(0, 2);
-    initLanguage(applicationConfiguration.language, applicationConfiguration.network.baseURL);
+    //fetch default language and set
+    Api.request({
+        url: 'languages',
+    })
+        .then(response => {
+            language = response.data.find(lang => lang.isDefault)?.iso;
+            // if the default language is defined in the configuration
+            if (applicationConfiguration.language) {
+                language = applicationConfiguration.language;
+            } else if (!language) {
+                // if there is a locales array in the configuration...
+                if (applicationConfiguration.locales) {
+                    const browserLanguage = get(navigator, 'languages[0]', navigator.language).replace(
+                        '-',
+                        '_'
+                    );
+                    const matchToBrowserLanguage = find(applicationConfiguration.locales, {
+                        code: browserLanguage,
+                    });
+                    const preferred = find(applicationConfiguration.locales, {
+                        preferred: true,
+                    });
+
+                    // if there is a match with the browser language use that
+                    if (matchToBrowserLanguage) {
+                        language = matchToBrowserLanguage.code;
+                    }
+                    // if the preferred language is set use it
+                    else if (preferred) {
+                        language = preferred.code;
+                    }
+                    // otherwise use the first from the locales list
+                    else {
+                        language = first(applicationConfiguration.locales).code;
+                    }
+                }
+                // we have no info about the language, so try to use the browser language
+                else {
+                    language =
+                        get(navigator, 'languages[0]', navigator.language).replace('-', '_') || 'de_DE';
+                }
+            }
+
+            if (
+                !find(applicationConfiguration.locales, {
+                    code: language.replace('-', '_'),
+                })
+            ) {
+                // eslint-disable-next-line no-console
+                console.warn(`The selected language (${language}) is not listed in the available languages!`);
+                language = find(applicationConfiguration.locales, { preferred: true }).code;
+            }
+            applicationConfiguration.language = language.replace('_', '-');
+            Api.setLanguage(applicationConfiguration.language);
+            document.documentElement.lang = language.substring(0, 2);
+            initLanguage(applicationConfiguration.language, applicationConfiguration.network.baseURL);
+        })
+        .catch(error => {
+            // eslint-disable-next-line no-console
+            console.error('Error by loading api default language!', error);
+        });
 }
 
 // backward compatibility alias