Merge remote-tracking branch 'origin/develop' into dependabot/npm_and…

…_yarn/ui/develop/swiper-11.2.0
OpenEMS · Jan 7, 2025 · 6363de1 · 6363de1
2 parents d0d6681 + 77e7550
commit 6363de1
Show file tree

Hide file tree

Showing 9 changed files with 87 additions and 20 deletions.
diff --git a/cnf/pom.xml b/cnf/pom.xml
@@ -61,7 +61,7 @@
 			<!-- Used by com.squareup.okhttp3: okhttp -->
 			<groupId>com.squareup.okio</groupId>
 			<artifactId>okio-jvm</artifactId>
-			<version>3.9.1</version>
+			<version>3.10.0</version>
 		</dependency>
 		<dependency>
 			<!-- Used by com.influxdb: influxdb-client -->

diff --git a/io.openems.backend.application/BackendApp.bndrun b/io.openems.backend.application/BackendApp.bndrun
@@ -65,7 +65,7 @@
 	com.google.gson;version='[2.11.0,2.11.1)',\
 	com.google.guava;version='[33.4.0,33.4.1)',\
 	com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
-	com.squareup.okio;version='[3.9.1,3.9.2)',\
+	com.squareup.okio;version='[3.10.0,3.10.1)',\
 	com.zaxxer.HikariCP;version='[6.2.1,6.2.2)',\
 	io.openems.backend.alerting;version=snapshot,\
 	io.openems.backend.application;version=snapshot,\

diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun
@@ -209,7 +209,7 @@
 	com.google.gson;version='[2.11.0,2.11.1)',\
 	com.google.guava;version='[33.4.0,33.4.1)',\
 	com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
-	com.squareup.okio;version='[3.9.1,3.9.2)',\
+	com.squareup.okio;version='[3.10.0,3.10.1)',\
 	com.sun.jna;version='[5.16.0,5.16.1)',\
 	io.openems.common;version=snapshot,\
 	io.openems.edge.application;version=snapshot,\

diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -12,8 +12,8 @@
     "@angular/platform-browser-dynamic": "19.0.5",
     "@angular/router": "19.0.5",
     "@angular/service-worker": "19.0.5",
-    "@awesome-cordova-plugins/core": "^6.13.0",
-    "@awesome-cordova-plugins/file-opener": "^6.13.0",
+    "@awesome-cordova-plugins/core": "^6.14.0",
+    "@awesome-cordova-plugins/file-opener": "^6.14.0",
     "@capacitor-community/file-opener": "^6.0.1",
     "@capacitor/android": "^6.2.0",
     "@capacitor/app": "^6.0.2",
@@ -79,7 +79,7 @@
     "@types/uuid": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^8.19.0",
     "@typescript-eslint/parser": "^8.19.0",
-    "@typescript-eslint/types": "^8.19.0",
+    "@typescript-eslint/types": "^8.19.1",
     "eslint": "^9.17.0",
     "eslint-import-resolver-typescript": "^3.7.0",
     "eslint-plugin-check-file": "^2.8.0",

diff --git a/ui/src/app/shared/type/language.ts b/ui/src/app/shared/type/language.ts
@@ -42,7 +42,7 @@ export class Language {
     public static readonly JA: Language = new Language("Japanese", "ja", "ja", ja, localJA);
 
     public static readonly ALL = [Language.DE, Language.EN, Language.CZ, Language.NL, Language.ES, Language.FR, Language.JA];
-    public static readonly DEFAULT = Language.DE;
+    public static readonly DEFAULT = Language.getByKey(environment.defaultLanguage) as Language;
 
     constructor(
         public readonly title: string,

diff --git a/ui/src/environments/index.ts b/ui/src/environments/index.ts
@@ -11,6 +11,7 @@ export interface Environment {
     readonly uiTitle: string;
     readonly edgeShortName: string;
     readonly edgeLongName: string;
+    readonly defaultLanguage: string;
 
     readonly url: string;
     readonly backend: DefaultTypes.Backend;

diff --git a/ui/src/global.scss b/ui/src/global.scss
@@ -82,7 +82,7 @@ formly-field-ion-radio {
             white-space: initial;
 
             small {
-                white-space: initial;
+                white-space: nowrap;
             }
         }
 

diff --git a/ui/src/themes/openems/environments/theme.ts b/ui/src/themes/openems/environments/theme.ts
@@ -6,6 +6,7 @@ export const theme = {
     uiTitle: "OpenEMS UI",
     edgeShortName: "OpenEMS",
     edgeLongName: "Open Energy Management System",
+    defaultLanguage: "de",
 
     docsUrlPrefix: "https://github.com/OpenEMS/openems/blob/develop/",
     links: {
-Original file line number
+Diff line change
@@ Expand Up / @@ -82,7 +82,7 @@ formly-field-ion-radio { @@
                 white-space: initial;
                 small {
-                    white-space: initial;
+                    white-space: nowrap;
                 }
             }
@@ Expand Down @@