Merge branch 'emsesp:dev' into dev

2025-12-09 09:19:51 +03:00 · 2022-11-13 13:00:41 +01:00
parent ea2c9cbc9a 8ed789892b
commit 058246e2ce
15 changed files with 113 additions and 115 deletions
--- a/interface/.typesafe-i18n.json
+++ b/interface/.typesafe-i18n.json
@@ -1,5 +1,5 @@
 {
-  "adapter": "react",
-  "baseLocale": "pl",
-  "$schema": "https://unpkg.com/typesafe-i18n@5.16.2/schema/typesafe-i18n.json"
-}
+   "adapter": "react",
+   "baseLocale": "pl",
+   "$schema": "https://unpkg.com/typesafe-i18n@5.16.3/schema/typesafe-i18n.json"
+}
--- a/interface/package-lock.json
+++ b/interface/package-lock.json
@@ -12,7 +12,7 @@
        "@emotion/styled": "^11.10.5",
        "@msgpack/msgpack": "^2.8.0",
        "@mui/icons-material": "^5.10.9",
-        "@mui/material": "^5.10.12",
+        "@mui/material": "^5.10.13",
        "@table-library/react-table-library": "4.0.23",
        "@types/lodash": "^4.14.188",
        "@types/node": "^18.11.9",
@@ -34,7 +34,7 @@
        "react-router-dom": "^6.4.3",
        "react-scripts": "5.0.1",
        "sockette": "^2.0.6",
-        "typesafe-i18n": "^5.16.2",
+        "typesafe-i18n": "^5.16.3",
        "typescript": "^4.8.4"
      },
      "devDependencies": {
@@ -3091,9 +3091,9 @@
      }
    },
    "node_modules/@mui/base": {
-      "version": "5.0.0-alpha.104",
-      "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.104.tgz",
-      "integrity": "sha512-tQPxZTzfYMwxYfKhEwufbTfdLpNjFdW7bXq6dK0j8651AAyZL4M8wynWUQ98hH1362R26mZFhVxHB2UD9t7VuA==",
+      "version": "5.0.0-alpha.105",
+      "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.105.tgz",
+      "integrity": "sha512-4IPBcJQIgVVXQvN6DQMoCHed52GBtwSqYs0jD0dDcMR3o76AodQtpEeWFz3p7mJoc6f/IHBl9U6jEfL1r/kM4g==",
      "dependencies": {
        "@babel/runtime": "^7.19.0",
        "@emotion/is-prop-valid": "^1.2.0",
@@ -3123,9 +3123,9 @@
      }
    },
    "node_modules/@mui/core-downloads-tracker": {
-      "version": "5.10.12",
-      "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.12.tgz",
-      "integrity": "sha512-cR8lOS606G++iVHR8I6ySgMAEiPoA3DxO/nLeqiv7w7d1707kvKoV4/7SWjh4ui+kHb052xlf/G196q2EKx31w==",
+      "version": "5.10.13",
+      "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.13.tgz",
+      "integrity": "sha512-zWkWPV/SaNdsIdxAWiuVGZ+Ue3BkfSIlU/BFIrJmuUcwiIa7gQsbI/DOpj1KzLvqZhdEe2wC1aG4nCHfzgc1Hg==",
      "funding": {
        "type": "opencollective",
        "url": "https://opencollective.com/mui"
@@ -3157,14 +3157,14 @@
      }
    },
    "node_modules/@mui/material": {
-      "version": "5.10.12",
-      "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.10.12.tgz",
-      "integrity": "sha512-rG9ZTkG9qUwujyAY1I+uQAa9pkGdsWY3KN+wvS/6H6ZbYIA06QRwmig6ySC6LbeB3WL/I/1ngwJqWX7nfINSbA==",
+      "version": "5.10.13",
+      "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.10.13.tgz",
+      "integrity": "sha512-TkkT1rNc0/hhL4/+zv4gYcA6egNWBH/1Tz+azoTnQIUdZ32fgwFI2pFX2KVJNTt30xnLznxDWtTv7ilmJQ52xw==",
      "dependencies": {
        "@babel/runtime": "^7.19.0",
-        "@mui/base": "5.0.0-alpha.104",
-        "@mui/core-downloads-tracker": "^5.10.12",
-        "@mui/system": "^5.10.12",
+        "@mui/base": "5.0.0-alpha.105",
+        "@mui/core-downloads-tracker": "^5.10.13",
+        "@mui/system": "^5.10.13",
        "@mui/types": "^7.2.0",
        "@mui/utils": "^5.10.9",
        "@types/react-transition-group": "^4.4.5",
@@ -3258,9 +3258,9 @@
      }
    },
    "node_modules/@mui/system": {
-      "version": "5.10.12",
-      "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.10.12.tgz",
-      "integrity": "sha512-9DcN3hF2KTTTpZ0K5Tn20B+Tz7tIqDmJLk1M6P0CYoAGUN/xrcF/6dn1zZ829rxE5tmauoDUekTfomrvPsvlSQ==",
+      "version": "5.10.13",
+      "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.10.13.tgz",
+      "integrity": "sha512-Xzx26Asu5fVlm0ucm+gnJmeX4Y1isrpVDvqxX4yJaOT7Fzmd8Lfq9ih3QMfZajns5LMtUiOuCQlVFRtUG5IY7A==",
      "dependencies": {
        "@babel/runtime": "^7.19.0",
        "@mui/private-theming": "^5.10.9",
@@ -16398,9 +16398,9 @@
      }
    },
    "node_modules/typesafe-i18n": {
-      "version": "5.16.2",
-      "resolved": "https://registry.npmjs.org/typesafe-i18n/-/typesafe-i18n-5.16.2.tgz",
-      "integrity": "sha512-s1eVQUhq7e0nbVm5Ntb3fLmA1UNi3yEUZN0VCPGGAzVAyS2IUdtDP1J9DINGgbFmBUkHwEAZ6DPSRl9Ca1cPaA==",
+      "version": "5.16.3",
+      "resolved": "https://registry.npmjs.org/typesafe-i18n/-/typesafe-i18n-5.16.3.tgz",
+      "integrity": "sha512-9KxHDFzNW5vA1a4kVPEm9Jslch0H5W2IkPcJjuaqofr86U0EXkrkvF3IbPjzwnWwEf/wC900ZE7RPnePW5KYKg==",
      "bin": {
        "typesafe-i18n": "cli/typesafe-i18n.mjs"
      },
@@ -19614,9 +19614,9 @@
      "integrity": "sha512-h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ=="
    },
    "@mui/base": {
-      "version": "5.0.0-alpha.104",
-      "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.104.tgz",
-      "integrity": "sha512-tQPxZTzfYMwxYfKhEwufbTfdLpNjFdW7bXq6dK0j8651AAyZL4M8wynWUQ98hH1362R26mZFhVxHB2UD9t7VuA==",
+      "version": "5.0.0-alpha.105",
+      "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.105.tgz",
+      "integrity": "sha512-4IPBcJQIgVVXQvN6DQMoCHed52GBtwSqYs0jD0dDcMR3o76AodQtpEeWFz3p7mJoc6f/IHBl9U6jEfL1r/kM4g==",
      "requires": {
        "@babel/runtime": "^7.19.0",
        "@emotion/is-prop-valid": "^1.2.0",
@@ -19629,9 +19629,9 @@
      }
    },
    "@mui/core-downloads-tracker": {
-      "version": "5.10.12",
-      "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.12.tgz",
-      "integrity": "sha512-cR8lOS606G++iVHR8I6ySgMAEiPoA3DxO/nLeqiv7w7d1707kvKoV4/7SWjh4ui+kHb052xlf/G196q2EKx31w=="
+      "version": "5.10.13",
+      "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.13.tgz",
+      "integrity": "sha512-zWkWPV/SaNdsIdxAWiuVGZ+Ue3BkfSIlU/BFIrJmuUcwiIa7gQsbI/DOpj1KzLvqZhdEe2wC1aG4nCHfzgc1Hg=="
    },
    "@mui/icons-material": {
      "version": "5.10.9",
@@ -19642,14 +19642,14 @@
      }
    },
    "@mui/material": {
-      "version": "5.10.12",
-      "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.10.12.tgz",
-      "integrity": "sha512-rG9ZTkG9qUwujyAY1I+uQAa9pkGdsWY3KN+wvS/6H6ZbYIA06QRwmig6ySC6LbeB3WL/I/1ngwJqWX7nfINSbA==",
+      "version": "5.10.13",
+      "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.10.13.tgz",
+      "integrity": "sha512-TkkT1rNc0/hhL4/+zv4gYcA6egNWBH/1Tz+azoTnQIUdZ32fgwFI2pFX2KVJNTt30xnLznxDWtTv7ilmJQ52xw==",
      "requires": {
        "@babel/runtime": "^7.19.0",
-        "@mui/base": "5.0.0-alpha.104",
-        "@mui/core-downloads-tracker": "^5.10.12",
-        "@mui/system": "^5.10.12",
+        "@mui/base": "5.0.0-alpha.105",
+        "@mui/core-downloads-tracker": "^5.10.13",
+        "@mui/system": "^5.10.13",
        "@mui/types": "^7.2.0",
        "@mui/utils": "^5.10.9",
        "@types/react-transition-group": "^4.4.5",
@@ -19682,9 +19682,9 @@
      }
    },
    "@mui/system": {
-      "version": "5.10.12",
-      "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.10.12.tgz",
-      "integrity": "sha512-9DcN3hF2KTTTpZ0K5Tn20B+Tz7tIqDmJLk1M6P0CYoAGUN/xrcF/6dn1zZ829rxE5tmauoDUekTfomrvPsvlSQ==",
+      "version": "5.10.13",
+      "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.10.13.tgz",
+      "integrity": "sha512-Xzx26Asu5fVlm0ucm+gnJmeX4Y1isrpVDvqxX4yJaOT7Fzmd8Lfq9ih3QMfZajns5LMtUiOuCQlVFRtUG5IY7A==",
      "requires": {
        "@babel/runtime": "^7.19.0",
        "@mui/private-theming": "^5.10.9",
@@ -29064,9 +29064,9 @@
      }
    },
    "typesafe-i18n": {
-      "version": "5.16.2",
-      "resolved": "https://registry.npmjs.org/typesafe-i18n/-/typesafe-i18n-5.16.2.tgz",
-      "integrity": "sha512-s1eVQUhq7e0nbVm5Ntb3fLmA1UNi3yEUZN0VCPGGAzVAyS2IUdtDP1J9DINGgbFmBUkHwEAZ6DPSRl9Ca1cPaA==",
+      "version": "5.16.3",
+      "resolved": "https://registry.npmjs.org/typesafe-i18n/-/typesafe-i18n-5.16.3.tgz",
+      "integrity": "sha512-9KxHDFzNW5vA1a4kVPEm9Jslch0H5W2IkPcJjuaqofr86U0EXkrkvF3IbPjzwnWwEf/wC900ZE7RPnePW5KYKg==",
      "requires": {}
    },
    "typescript": {
--- a/interface/package.json
+++ b/interface/package.json
@@ -8,7 +8,7 @@
    "@emotion/styled": "^11.10.5",
    "@msgpack/msgpack": "^2.8.0",
    "@mui/icons-material": "^5.10.9",
-    "@mui/material": "^5.10.12",
+    "@mui/material": "^5.10.13",
    "@table-library/react-table-library": "4.0.23",
    "@types/lodash": "^4.14.188",
    "@types/node": "^18.11.9",
@@ -30,7 +30,7 @@
    "react-router-dom": "^6.4.3",
    "react-scripts": "5.0.1",
    "sockette": "^2.0.6",
-    "typesafe-i18n": "^5.16.2",
+    "typesafe-i18n": "^5.16.3",
    "typescript": "^4.8.4"
  },
  "scripts": {
--- a/interface/src/i18n/en/index.ts
+++ b/interface/src/i18n/en/index.ts
@@ -98,10 +98,10 @@ const en: BaseTranslation = {
  NUM_DEVICES: '{num} Device{{s}}',
  NUM_TEMP_SENSORS: '{num} Temperature Sensor{{s}}',
  NUM_ANALOG_SENSORS: '{num} Analog Sensor{{s}}',
-  NUM_DAYS: '{num} Day{{s}}',
-  NUM_SECONDS: '{num} Second{{s}}',
-  NUM_HOURS: '{num} Hour{{s}}',
-  NUM_MINUTES: '{num} Minute{{s}}',
+  NUM_DAYS: '{num} day{{s}}',
+  NUM_SECONDS: '{num} second{{s}}',
+  NUM_HOURS: '{num} hour{{s}}',
+  NUM_MINUTES: '{num} minute{{s}}',
  APPLICATION_SETTINGS: 'Application Settings',
  CUSTOMIZATION: 'Customization',
  APPLICATION_RESTARTING: 'EMS-ESP is restarting',
--- a/interface/src/i18n/nl/index.ts
+++ b/interface/src/i18n/nl/index.ts
@@ -98,10 +98,10 @@ const nl: Translation = {
  NUM_DEVICES: '{num} Apparaat{{en}}',
  NUM_TEMP_SENSORS: '{num} Temperatuursensor{{en}}',
  NUM_ANALOG_SENSORS: '{num} Analoge sensor{{en}}',
-  NUM_DAYS: '{num} Dag{{en}}',
-  NUM_SECONDS: '{num} Second{{en}}',
-  NUM_HOURS: '{num} Uur{{en}}',
-  NUM_MINUTES: '{num} Minuut{{en}}',
+  NUM_DAYS: '{num} dag{{en}}',
+  NUM_SECONDS: '{num} second{{en}}',
+  NUM_HOURS: '{num} uur{{en}}',
+  NUM_MINUTES: '{num} minuut{{en}}',
  APPLICATION_SETTINGS: 'Applicatieinstellingen',
  CUSTOMIZATION: 'Custom aanpassingen',
  APPLICATION_RESTARTING: 'EMS-ESP herstarten',
--- a/interface/src/i18n/no/index.ts
+++ b/interface/src/i18n/no/index.ts
@@ -98,10 +98,10 @@ const no: Translation = {
  NUM_DEVICES: '{num} Enhet{{er}}',
  NUM_TEMP_SENSORS: '{num} Temperatursensor{{er}}',
  NUM_ANALOG_SENSORS: '{num} Analogsensor{{er}}',
-  NUM_DAYS: '{num} Dag{{er}}',
-  NUM_SECONDS: '{num} Sekund{{er}}',
-  NUM_HOURS: '{num} Time{{r}}',
-  NUM_MINUTES: '{num} Minutt{{er}}',
+  NUM_DAYS: '{num} sag{{er}}',
+  NUM_SECONDS: '{num} sekund{{er}}',
+  NUM_HOURS: '{num} time{{r}}',
+  NUM_MINUTES: '{num} minutt{{er}}',
  APPLICATION_SETTINGS: 'Innstillinger',
  CUSTOMIZATION: 'Tilpasninger',
  APPLICATION_RESTARTING: 'EMS-ESP restarter',
--- a/interface/src/i18n/se/index.ts
+++ b/interface/src/i18n/se/index.ts
@@ -98,10 +98,10 @@ const se: Translation = {
  NUM_DEVICES: '{num} Enhet{{er}}',
  NUM_TEMP_SENSORS: '{num} Temperatur-sensor{{er}}',
  NUM_ANALOG_SENSORS: '{num} Analoga Sensor{{er}}',
-  NUM_DAYS: '{num} Dag{{ar}}',
-  NUM_SECONDS: '{num} Sekund{{er}}',
-  NUM_HOURS: '{num} Timmar',
-  NUM_MINUTES: '{num} Minut{{er}}',
+  NUM_DAYS: '{num} dag{{ar}}',
+  NUM_SECONDS: '{num} sekund{{er}}',
+  NUM_HOURS: '{num} timmar',
+  NUM_MINUTES: '{num} minut{{er}}',
  APPLICATION_SETTINGS: 'Inställningar',
  CUSTOMIZATION: 'Anpassa',
  APPLICATION_RESTARTING: 'EMS-ESP startar om',