100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Get language from query parameters to set the default language
Michael Rademakerf7e31b1eebcf
diff --git a/model/src/main/java/org/openremote/model/manager/ManagerConfig.java b/model/src/main/java/org/openremote/model/manager/ManagerConfig.javaindex 497d26d31..4a85fab19 100644--- a/model/src/main/java/org/openremote/model/manager/ManagerConfig.java+++ b/model/src/main/java/org/openremote/model/manager/ManagerConfig.java@@ -41,5 +41,5 @@ public class ManagerConfig {protected MapType mapType;protected Object configureTranslationsOptions;protected Object basicLoginProvider;-+ protected String defaultLanguage;}diff --git a/ui/app/console_loader/src/index.ts b/ui/app/console_loader/src/index.tsindex 45fd98606..e1b140390 100644--- a/ui/app/console_loader/src/index.ts+++ b/ui/app/console_loader/src/index.ts@@ -8,8 +8,7 @@ import "@openremote/or-app";import {OrApp,AppConfig,- appReducer,- getRealmQueryParameter} from "@openremote/or-app";+ appReducer} from "@openremote/or-app";import "./pages/page-mobile-onboarding";import {pageMobileOnboardingProvider, OnboardingConfig} from "./pages/page-mobile-onboarding";@@ -17,6 +16,7 @@ import "./pages/page-mobile-splash";import {pageMobileSplashProvider, SplashConfig} from "./pages/page-mobile-splash";import "./pages/page-mobile-geofences";import {pageMobileGeofencesProvider} from "./pages/page-mobile-geofences";+import { Util } from "@openremote/core";const onboardingConfig:OnboardingConfig = {pages: [@@ -71,9 +71,10 @@ const managerConfig: ManagerConfig = {managerUrl: MANAGER_URL,auth: Auth.NONE,autoLogin: false,- realm: getRealmQueryParameter(),+ realm: Util.getQueryParameter("realm"),consoleAutoEnable: false,- loadTranslations: ["app", "or"]+ loadTranslations: ["app", "or"],+ defaultLanguage: Util.getQueryParameter("lang") || "en",};const appConfig: AppConfig<RootState> = {diff --git a/ui/component/core/src/index.ts b/ui/component/core/src/index.tsindex ac0b25a22..73f576e86 100644--- a/ui/component/core/src/index.ts+++ b/ui/component/core/src/index.ts@@ -446,7 +446,7 @@ export class Manager implements EventProviderFactory {// Look for language preference in local storageconst language: string | undefined = !this.console ? undefined : await this.console.retrieveData("LANGUAGE");const initOptions: InitOptions = {- lng: language || "en",+ lng: language || this.config.defaultLanguage || "en",fallbackLng: "en",defaultNS: "app",fallbackNS: "or",diff --git a/ui/component/core/src/util.ts b/ui/component/core/src/util.tsindex f5ef193be..e2cc4b312 100644--- a/ui/component/core/src/util.ts+++ b/ui/component/core/src/util.ts@@ -66,8 +66,19 @@ export function getQueryParameters(queryStr: string): any {return Qs.parse(queryStr, {ignoreQueryPrefix: true});}-export function getQueryParameter(queryStr: string, parameter: string): any | undefined {- const parsed = getQueryParameters(queryStr);+export function getQueryParameter(parameter: string): any | undefined {+ let parsed;++ if (location.search && location.search !== "") {+ parsed = getQueryParameters(location.search);+ }++ if (location.hash) {+ const index = location.hash.indexOf("?");+ if (index > -1) {+ parsed = getQueryParameters(location.hash.substring(index + 1));+ }+ }return parsed ? parsed[parameter] : undefined;}diff --git a/ui/component/or-app/src/index.ts b/ui/component/or-app/src/index.tsindex 1523e26bf..5dcddebc3 100644--- a/ui/component/or-app/src/index.ts+++ b/ui/component/or-app/src/index.ts@@ -33,19 +33,6 @@ declare var KEYCLOAK_URL: string | undefined;export {HeaderConfig, DEFAULT_LANGUAGES};-export function getRealmQueryParameter(): string | undefined {- if(location.search && location.search !== "") {- return Util.getQueryParameter(location.search, "realm");- }-- if(location.hash) {- const index = location.hash.indexOf("?");- if(index > -1) {- return Util.getQueryParameter(location.hash.substring(index + 1), "realm");- }- }-}-export function getDefaultManagerConfig() {return normaliseConfig(DEFAULT_MANAGER_CONFIG);}@@ -204,7 +191,10 @@ export class OrApp<S extends AppStateKeyed> extends LitElement {const managerConfig: ManagerConfig = this.managerConfig ? {...DEFAULT_MANAGER_CONFIG,...this.managerConfig} : DEFAULT_MANAGER_CONFIG;if (!managerConfig.realm) {// Use realm query parameter if no specific realm provided- managerConfig.realm = getRealmQueryParameter();+ managerConfig.realm = Util.getQueryParameter("realm");+ }+ if (!managerConfig.defaultLanguage) {+ managerConfig.defaultLanguage = Util.getQueryParameter("lang")?.toLowerCase();}managerConfig.skipFallbackToBasicAuth = true; // We do this so we can load styling config before displaying basic loginmanagerConfig.basicLoginProvider = (u:any, p:any) => this.doBasicLogin(u, p);