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
Prefer i18next from or-translate (#2220)
Koen7ef94cf66016
diff --git a/ui/app/manager/package.json b/ui/app/manager/package.jsonindex 3bb627ed7..cf85c5bc4 100644--- a/ui/app/manager/package.json+++ b/ui/app/manager/package.json@@ -48,7 +48,6 @@"@openremote/or-translate": "workspace:*","@openremote/rest": "workspace:*","@reduxjs/toolkit": "^1.8.1",- "i18next": "^21.5.3","iso-639-1": "^3.1.3","lit": "^3.3.1","maplibre-gl": "^4.1.2",diff --git a/ui/app/manager/src/pages/page-alarms.ts b/ui/app/manager/src/pages/page-alarms.tsindex 1e3578c1d..804ac3c43 100644--- a/ui/app/manager/src/pages/page-alarms.ts+++ b/ui/app/manager/src/pages/page-alarms.ts@@ -13,7 +13,7 @@ import {UserQuery} from "@openremote/model";import manager, {DefaultColor3, DefaultColor4} from "@openremote/core";-import i18next from "i18next";+import {i18next} from "@openremote/or-translate"import {showSnackbar} from "@openremote/or-mwc-components/or-mwc-snackbar";import {GenericAxiosResponse, isAxiosError} from "@openremote/rest";import {getAlarmsRoute} from "../routes";diff --git a/ui/app/manager/src/pages/page-assets.ts b/ui/app/manager/src/pages/page-assets.tsindex 13835986b..a1ecae475 100644--- a/ui/app/manager/src/pages/page-assets.ts+++ b/ui/app/manager/src/pages/page-assets.ts@@ -24,7 +24,7 @@ import manager, {DefaultBoxShadow, DefaultColor5, Util} from "@openremote/core";import {AppStateKeyed, Page, PageProvider, router} from "@openremote/or-app";import {createSlice, Store, createSelector} from "@reduxjs/toolkit";import {DialogAction, OrMwcDialog, showDialog, showOkCancelDialog} from "@openremote/or-mwc-components/or-mwc-dialog";-import i18next from "i18next";+import {i18next} from "@openremote/or-translate"import {Asset, AssetEventCause, WellknownAssets} from "@openremote/model";import "@openremote/or-json-forms";import {getAlarmsRoute, getAssetsRoute, getUsersRoute} from "../routes";diff --git a/ui/app/manager/src/pages/page-gateway.ts b/ui/app/manager/src/pages/page-gateway.tsindex 8e61cd968..0ab7cdb70 100644--- a/ui/app/manager/src/pages/page-gateway.ts+++ b/ui/app/manager/src/pages/page-gateway.ts@@ -1,6 +1,6 @@import {css, html, PropertyValues, TemplateResult, unsafeCSS} from "lit";import {customElement, state} from "lit/decorators.js";-import i18next from "i18next";+import {i18next} from "@openremote/or-translate"import {when} from "lit/directives/when.js";import {until} from "lit/directives/until.js";import {createRef, Ref, ref} from "lit/directives/ref.js";diff --git a/ui/component/or-app/package.json b/ui/component/or-app/package.jsonindex 91ca6002a..e26ce976b 100644--- a/ui/component/or-app/package.json+++ b/ui/component/or-app/package.json@@ -28,7 +28,6 @@"@openremote/or-translate": "workspace:*","@reduxjs/toolkit": "^1.8.1","@webcomponents/webcomponentsjs": "^2.6.0",- "i18next": "^21.5.3","lit": "^3.3.1","navigo": "^8.11.1","pwa-helpers": "^0.9.0"diff --git a/ui/component/or-app/src/index.ts b/ui/component/or-app/src/index.tsindex 94679538a..2ef4e8146 100644--- a/ui/component/or-app/src/index.ts+++ b/ui/component/or-app/src/index.ts@@ -7,7 +7,7 @@ import "@openremote/or-mwc-components/or-mwc-snackbar";import "./or-header";import "@openremote/or-icon";import {updateMetadata} from "pwa-helpers/metadata";-import i18next from "i18next";+import {i18next} from "@openremote/or-translate"import manager, {BasicLoginResult, DefaultColor2, DefaultColor3, DefaultColor4, Manager, normaliseConfig, ORError, OREvent, Util} from "@openremote/core";import {DEFAULT_LANGUAGES, HeaderConfig} from "./or-header";import {OrMwcDialog, showDialog, showErrorDialog} from "@openremote/or-mwc-components/or-mwc-dialog";diff --git a/ui/component/or-app/src/page-offline.ts b/ui/component/or-app/src/page-offline.tsindex ee0e52f44..5750526de 100644--- a/ui/component/or-app/src/page-offline.ts+++ b/ui/component/or-app/src/page-offline.ts@@ -3,7 +3,6 @@ import {css, html, TemplateResult} from "lit";import {customElement, state} from "lit/decorators.js";import {AppStateKeyed} from "./app";import {Store} from "@reduxjs/toolkit";-import {i18next} from "@openremote/or-translate";import manager, {OREvent} from "@openremote/core";import {asyncReplace} from 'lit/directives/async-replace.js';import {when} from 'lit/directives/when.js';diff --git a/ui/component/or-app/src/types.ts b/ui/component/or-app/src/types.tsindex dcc2bb16e..12570ee3c 100644--- a/ui/component/or-app/src/types.ts+++ b/ui/component/or-app/src/types.ts@@ -1,8 +1,7 @@import {HeaderConfig, Languages} from "./or-header";import {AppStateKeyed} from "./app";import {LitElement, TemplateResult} from "lit";-import i18next from "i18next";-import {translate} from "@openremote/or-translate";+import {i18next, translate} from "@openremote/or-translate"import {AnyAction, Store, Unsubscribe} from "@reduxjs/toolkit";import Navigo from "navigo";diff --git a/ui/component/or-asset-viewer/src/or-add-attribute-panel.ts b/ui/component/or-asset-viewer/src/or-add-attribute-panel.tsindex ac79e8fe9..e41a2f20f 100644--- a/ui/component/or-asset-viewer/src/or-add-attribute-panel.ts+++ b/ui/component/or-asset-viewer/src/or-add-attribute-panel.ts@@ -1,7 +1,7 @@import {html, LitElement, css, PropertyValues} from "lit";import {customElement, property, query} from "lit/decorators.js";import {InputType, OrMwcInput, OrInputChangedEvent} from "@openremote/or-mwc-components/or-mwc-input";-import i18next from "i18next";+import {i18next} from "@openremote/or-translate"import {Asset, Attribute, AssetModelUtil} from "@openremote/model";import {Util} from "@openremote/core";import "@openremote/or-mwc-components/or-mwc-input";diff --git a/ui/component/or-asset-viewer/src/or-edit-asset-panel.ts b/ui/component/or-asset-viewer/src/or-edit-asset-panel.tsindex 600473c3e..c40d0116f 100644--- a/ui/component/or-asset-viewer/src/or-edit-asset-panel.ts+++ b/ui/component/or-asset-viewer/src/or-edit-asset-panel.ts@@ -2,7 +2,7 @@ import {css, html, LitElement, PropertyValues, TemplateResult, unsafeCSS} from "import {until} from "lit/directives/until.js";import {customElement, property, state} from "lit/decorators.js";import {InputType, OrMwcInput, OrInputChangedEvent, getValueHolderInputTemplateProvider, ValueInputProviderOptions, OrInputChangedEventDetail, ValueInputProvider} from "@openremote/or-mwc-components/or-mwc-input";-import i18next from "i18next";+import {i18next} from "@openremote/or-translate"import {Asset, Attribute, NameValueHolder, AssetModelUtil, WellknownMetaItems} from "@openremote/model";import { DefaultColor5, DefaultColor3, DefaultColor2, Util} from "@openremote/core";import "@openremote/or-mwc-components/or-mwc-input";diff --git a/ui/component/or-attribute-barchart/package.json b/ui/component/or-attribute-barchart/package.jsonindex 64b86e224..278e7266b 100644--- a/ui/component/or-attribute-barchart/package.json+++ b/ui/component/or-attribute-barchart/package.json@@ -23,7 +23,6 @@"@openremote/or-translate": "workspace:*","@openremote/rest": "workspace:*","echarts": "~5.6.0",- "i18next": "^21.5.3","lit": "^3.3.1","moment": "^2.29.4"},diff --git a/ui/component/or-attribute-barchart/src/index.ts b/ui/component/or-attribute-barchart/src/index.tsindex 27d21af95..a975fb90a 100644--- a/ui/component/or-attribute-barchart/src/index.ts+++ b/ui/component/or-attribute-barchart/src/index.ts@@ -19,7 +19,7 @@*/import {css, html, LitElement, PropertyValues, TemplateResult, unsafeCSS} from "lit";import {customElement, property, state, query} from "lit/decorators.js";-import i18next from "i18next";+import {i18next} from "@openremote/or-translate"import {Asset, AssetDatapointIntervalQuery,AssetDatapointIntervalQueryFormula,diff --git a/ui/component/or-attribute-card/package.json b/ui/component/or-attribute-card/package.jsonindex 12d419e3a..6a7be3703 100644--- a/ui/component/or-attribute-card/package.json+++ b/ui/component/or-attribute-card/package.json@@ -26,10 +26,10 @@"@openremote/or-chart": "workspace:*","@openremote/or-icon": "workspace:*","@openremote/or-mwc-components": "workspace:*",+ "@openremote/or-translate": "workspace:*","@openremote/rest": "workspace:*","chart.js": "^3.6.0","chartjs-adapter-moment": "^1.0.0",- "i18next": "^21.5.3","lit": "^3.3.1","lodash": "^4.17.21","moment": "^2.29.4"diff --git a/ui/component/or-attribute-card/src/index.ts b/ui/component/or-attribute-card/src/index.tsindex 5fdd01118..0a0b50c9e 100644--- a/ui/component/or-attribute-card/src/index.ts+++ b/ui/component/or-attribute-card/src/index.ts@@ -1,6 +1,6 @@import {css, html, LitElement, PropertyValues, unsafeCSS} from "lit";import {customElement, property, state, query} from "lit/decorators.js";-import i18next from "i18next";+import {i18next} from "@openremote/or-translate"import {Asset,AssetEvent,diff --git a/ui/component/or-attribute-history/package.json b/ui/component/or-attribute-history/package.jsonindex ba27460ca..4516f487a 100644--- a/ui/component/or-attribute-history/package.json+++ b/ui/component/or-attribute-history/package.json@@ -27,7 +27,6 @@"@openremote/or-translate": "workspace:*","@openremote/rest": "workspace:*","echarts": "~5.6.0",- "i18next": "^21.5.3","jsonpath-plus": "^6.0.1","lit": "^3.3.1","lodash": "^4.17.21",diff --git a/ui/component/or-attribute-history/src/index.ts b/ui/component/or-attribute-history/src/index.tsindex e09902e45..69452f7b9 100644--- a/ui/component/or-attribute-history/src/index.ts+++ b/ui/component/or-attribute-history/src/index.ts@@ -15,8 +15,7 @@ import {unsafeCSS} from "lit";import {customElement, property, query} from "lit/decorators.js";-import i18next from "i18next";-import {translate} from "@openremote/or-translate";+import {i18next, translate} from "@openremote/or-translate"import {AssetModelUtil, Attribute, AttributeRef, DatapointInterval, ValueDatapoint, ValueDescriptor} from "@openremote/model";import manager, {DefaultColor2, DefaultColor3, DefaultColor4} from "@openremote/core";import "@openremote/or-mwc-components/or-mwc-input";diff --git a/ui/component/or-chart/package.json b/ui/component/or-chart/package.jsonindex 6c2f627f6..ce3f3e76e 100644--- a/ui/component/or-chart/package.json+++ b/ui/component/or-chart/package.json@@ -30,7 +30,6 @@"@openremote/or-translate": "workspace:*","@openremote/rest": "workspace:*","echarts": "~5.6.0",- "i18next": "^21.5.3","lit": "^3.3.1","lodash": "^4.17.21","moment": "^2.29.4"diff --git a/ui/component/or-chart/src/index.ts b/ui/component/or-chart/src/index.tsindex 5746451c2..2ac123e47 100644--- a/ui/component/or-chart/src/index.ts+++ b/ui/component/or-chart/src/index.ts@@ -1,7 +1,6 @@import {css, html, LitElement, PropertyValues, TemplateResult, unsafeCSS} from "lit";import {customElement, property, state, query} from "lit/decorators.js";-import i18next from "i18next";-import {translate} from "@openremote/or-translate";+import {i18next, translate} from "@openremote/or-translate"import {Asset,AssetDatapointQueryUnion,diff --git a/ui/component/or-data-viewer/package.json b/ui/component/or-data-viewer/package.jsonindex f421e9285..c71d786b2 100644--- a/ui/component/or-data-viewer/package.json+++ b/ui/component/or-data-viewer/package.json@@ -24,7 +24,6 @@"@openremote/or-chart": "workspace:*","@openremote/or-components": "workspace:*","@openremote/or-translate": "workspace:*",- "i18next": "^21.5.3","lit": "^3.3.1"},"publishConfig": {diff --git a/ui/component/or-data-viewer/src/index.ts b/ui/component/or-data-viewer/src/index.tsindex 8ba6441d9..bb0a54629 100644--- a/ui/component/or-data-viewer/src/index.ts+++ b/ui/component/or-data-viewer/src/index.ts@@ -2,12 +2,11 @@ import {html, LitElement, PropertyValues, TemplateResult} from "lit";import {customElement, property} from "lit/decorators.js";import "@openremote/or-chart";import "@openremote/or-translate";-import {translate} from "@openremote/or-translate";import "@openremote/or-components/or-panel";import {OrChartConfig, OrChartEvent} from "@openremote/or-chart";import {Asset, Attribute} from "@openremote/model";import {style} from "./style";-import i18next from "i18next";+import {i18next, translate} from "@openremote/or-translate"import {styleMap} from "lit/directives/style-map.js";import {classMap} from "lit/directives/class-map.js";import "@openremote/or-attribute-card";diff --git a/ui/component/or-log-viewer/package.json b/ui/component/or-log-viewer/package.jsonindex b3c744db3..25c97d1f0 100644--- a/ui/component/or-log-viewer/package.json+++ b/ui/component/or-log-viewer/package.json@@ -26,7 +26,6 @@"@openremote/or-translate": "workspace:*","axios": "0.24.0","http-link-header": "^1.1.3",- "i18next": "^21.5.3","lit": "^3.3.1","moment": "^2.29.4"},diff --git a/ui/component/or-log-viewer/src/index.ts b/ui/component/or-log-viewer/src/index.tsindex 15ce718e9..a2a8b5e0d 100644--- a/ui/component/or-log-viewer/src/index.ts+++ b/ui/component/or-log-viewer/src/index.ts@@ -7,8 +7,7 @@ import {unsafeCSS} from "lit";import {customElement, property, query} from "lit/decorators.js";-import i18next from "i18next";-import {translate} from "@openremote/or-translate";+import {i18next, translate} from "@openremote/or-translate"import * as Model from "@openremote/model";import manager, {DefaultColor2, DefaultColor3, DefaultColor4, DefaultColor5, Util} from "@openremote/core";import "@openremote/or-mwc-components/or-mwc-input";diff --git a/ui/component/or-rules/package.json b/ui/component/or-rules/package.jsonindex c27876d4e..19bf3b0c6 100644--- a/ui/component/or-rules/package.json+++ b/ui/component/or-rules/package.json@@ -31,7 +31,6 @@"@openremote/or-tree-menu": "workspace:*","@openremote/rest": "workspace:*","ace-builds": "^1.41.0",- "i18next": "^21.5.3","iso-639-1": "^3.1.3","linqts": "^1.12.6","lit": "^3.3.1",diff --git a/ui/component/or-rules/src/flow-viewer/components/workspace-contextmenu-options.ts b/ui/component/or-rules/src/flow-viewer/components/workspace-contextmenu-options.tsindex 8287e1cb0..6e35f04c3 100644--- a/ui/component/or-rules/src/flow-viewer/components/workspace-contextmenu-options.ts+++ b/ui/component/or-rules/src/flow-viewer/components/workspace-contextmenu-options.ts@@ -4,7 +4,7 @@ import { ConnectionLine } from "../flow-viewer";import { NodeType } from "@openremote/model";import { ContextMenuButton, ContextMenuSeparator } from "../models/context-menu-button";import { integration, project, copyPasteManager, input, exporter, modal } from "./flow-editor";-import i18next from "i18next";+import {i18next} from "@openremote/or-translate"import { Utilities } from "../utils";import { CopyMachine } from "../node-structure";import { ContextMenu } from "./context-menu";diff --git a/ui/component/or-rules/src/index.ts b/ui/component/or-rules/src/index.tsindex bb7b74a73..64cda9eda 100644--- a/ui/component/or-rules/src/index.ts+++ b/ui/component/or-rules/src/index.ts@@ -29,7 +29,7 @@ import manager, {DefaultColor6,Util} from "@openremote/core";-import i18next from "i18next";+import {i18next, translate} from "@openremote/or-translate"import "@openremote/or-icon";import {AssetModelUtil,@@ -52,7 +52,6 @@ import {} from "@openremote/model";import "@openremote/or-translate";import "@openremote/or-mwc-components/or-mwc-drawer";-import {translate} from "@openremote/or-translate";import "./or-rule-viewer";import "./or-rule-group-viewer";import "./or-rule-tree";diff --git a/ui/component/or-rules/src/json-viewer/forms/or-rule-form-email-message.ts b/ui/component/or-rules/src/json-viewer/forms/or-rule-form-email-message.tsindex ab78a15fc..ea1cd1647 100644--- a/ui/component/or-rules/src/json-viewer/forms/or-rule-form-email-message.ts+++ b/ui/component/or-rules/src/json-viewer/forms/or-rule-form-email-message.ts@@ -1,12 +1,10 @@import {html, LitElement, css} from "lit";import {customElement, property} from "lit/decorators.js";-import "@openremote/or-mwc-components/or-mwc-input";-import i18next from "i18next";-import {translate} from "@openremote/or-translate";-import "@openremote/or-mwc-components/or-mwc-input";+import {i18next, translate} from "@openremote/or-translate"import {InputType, OrInputChangedEvent} from "@openremote/or-mwc-components/or-mwc-input";import {EmailNotificationMessage} from "@openremote/model";import { OrRulesJsonRuleChangedEvent } from "../or-rule-json-viewer";+import "@openremote/or-mwc-components/or-mwc-input";@customElement("or-rule-form-email-message")export class OrRuleFormEmailMessage extends translate(i18next)(LitElement) {diff --git a/ui/component/or-rules/src/json-viewer/forms/or-rule-form-push-notification.ts b/ui/component/or-rules/src/json-viewer/forms/or-rule-form-push-notification.tsindex 9218d10f3..641a37ecf 100644--- a/ui/component/or-rules/src/json-viewer/forms/or-rule-form-push-notification.ts+++ b/ui/component/or-rules/src/json-viewer/forms/or-rule-form-push-notification.ts@@ -1,8 +1,7 @@import {html, LitElement, css, TemplateResult} from "lit";import {customElement, property} from "lit/decorators.js";import "@openremote/or-mwc-components/or-mwc-input";-import i18next from "i18next";-import {translate} from "@openremote/or-translate";+import {i18next, translate} from "@openremote/or-translate"import {InputType, OrInputChangedEvent} from "@openremote/or-mwc-components/or-mwc-input";import {PushNotificationMessage, PushNotificationButton} from "@openremote/model";import {OrRulesJsonRuleChangedEvent} from "../or-rule-json-viewer";diff --git a/ui/component/or-rules/src/json-viewer/modals/or-rule-alarm-modal.ts b/ui/component/or-rules/src/json-viewer/modals/or-rule-alarm-modal.tsindex 35425b479..71e950fb7 100644--- a/ui/component/or-rules/src/json-viewer/modals/or-rule-alarm-modal.ts+++ b/ui/component/or-rules/src/json-viewer/modals/or-rule-alarm-modal.ts@@ -27,8 +27,7 @@ import {import "@openremote/or-mwc-components/or-mwc-input";import {InputType, OrInputChangedEvent} from "@openremote/or-mwc-components/or-mwc-input";-import i18next from "i18next";-import {translate} from "@openremote/or-translate";+import {i18next, translate} from "@openremote/or-translate"import {DialogAction, OrMwcDialog, OrMwcDialogOpenedEvent} from "@openremote/or-mwc-components/or-mwc-dialog";import {OrRulesJsonRuleChangedEvent} from "../or-rule-json-viewer";diff --git a/ui/component/or-rules/src/json-viewer/modals/or-rule-notification-modal.ts b/ui/component/or-rules/src/json-viewer/modals/or-rule-notification-modal.tsindex 8f366f79d..a3eaa924b 100644--- a/ui/component/or-rules/src/json-viewer/modals/or-rule-notification-modal.ts+++ b/ui/component/or-rules/src/json-viewer/modals/or-rule-notification-modal.ts@@ -7,8 +7,7 @@ import {import "@openremote/or-mwc-components/or-mwc-input";import {InputType} from "@openremote/or-mwc-components/or-mwc-input";-import i18next from "i18next";-import {translate} from "@openremote/or-translate";+import {i18next, translate} from "@openremote/or-translate"import {DialogAction, DialogActionBase, OrMwcDialog, OrMwcDialogOpenedEvent} from "@openremote/or-mwc-components/or-mwc-dialog";import {OrRuleFormLocalized} from "../forms/or-rule-form-localized";diff --git a/ui/component/or-rules/src/json-viewer/modals/or-rule-radial-modal.ts b/ui/component/or-rules/src/json-viewer/modals/or-rule-radial-modal.tsindex e9ca0c2dd..fff992c50 100644--- a/ui/component/or-rules/src/json-viewer/modals/or-rule-radial-modal.ts+++ b/ui/component/or-rules/src/json-viewer/modals/or-rule-radial-modal.ts@@ -11,9 +11,8 @@ import {} from "../../index";import "@openremote/or-mwc-components/or-mwc-input";import {InputType} from "@openremote/or-mwc-components/or-mwc-input";-import i18next from "i18next";+import {i18next, translate} from "@openremote/or-translate"import {OrRulesJsonRuleChangedEvent} from "../or-rule-json-viewer";-import {translate} from "@openremote/or-translate";import {DialogAction, OrMwcDialog, OrMwcDialogOpenedEvent} from "@openremote/or-mwc-components/or-mwc-dialog";import {OrMap, OrMapClickedEvent, LngLatLike} from "@openremote/or-map";diff --git a/ui/component/or-rules/src/json-viewer/or-rule-action-attribute.ts b/ui/component/or-rules/src/json-viewer/or-rule-action-attribute.tsindex 12f8f5ba2..122c4f4b0 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-action-attribute.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-action-attribute.ts@@ -12,9 +12,8 @@ import {import {Util} from "@openremote/core";import "@openremote/or-attribute-input";import {InputType, OrInputChangedEvent} from "@openremote/or-mwc-components/or-mwc-input";-import i18next from "i18next";+import {i18next, translate} from "@openremote/or-translate"import {OrRulesJsonRuleChangedEvent} from "./or-rule-json-viewer";-import {translate} from "@openremote/or-translate";import {OrAttributeInputChangedEvent} from "@openremote/or-attribute-input";import { ifDefined } from "lit/directives/if-defined.js";import { when } from "lit/directives/when.js";diff --git a/ui/component/or-rules/src/json-viewer/or-rule-asset-query.ts b/ui/component/or-rules/src/json-viewer/or-rule-asset-query.tsindex 5dd0bf26d..bed2840b2 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-asset-query.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-asset-query.ts@@ -23,10 +23,9 @@ import "@openremote/or-mwc-components/or-mwc-input";import {InputType, OrInputChangedEvent} from "@openremote/or-mwc-components/or-mwc-input";import "@openremote/or-attribute-input";import {Util} from "@openremote/core";-import i18next from "i18next";+import {i18next, translate} from "@openremote/or-translate"import {buttonStyle} from "../style";import {OrRulesJsonRuleChangedEvent} from "./or-rule-json-viewer";-import {translate} from "@openremote/or-translate";import {OrAttributeInputChangedEvent} from "@openremote/or-attribute-input";import "./modals/or-rule-radial-modal";import { ifDefined } from "lit/directives/if-defined.js";diff --git a/ui/component/or-rules/src/json-viewer/or-rule-json-viewer.ts b/ui/component/or-rules/src/json-viewer/or-rule-json-viewer.tsindex 3606f60aa..467286e23 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-json-viewer.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-json-viewer.ts@@ -26,8 +26,7 @@ import manager, {Util} from "@openremote/core";import "./or-rule-when";import "./or-rule-then-otherwise";import "@openremote/or-components/or-panel";-import i18next from "i18next";-import {translate} from "@openremote/or-translate";+import {i18next, translate} from "@openremote/or-translate"export class OrRulesJsonRuleChangedEvent extends CustomEvent<void> {diff --git a/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.ts b/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.tsindex 4f50201d3..33f1af20e 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.ts@@ -20,7 +20,7 @@ import {RuleRecurrence,WellknownAssets} from "@openremote/model";-import i18next from "i18next";+import {i18next, translate} from "@openremote/or-translate"import {InputType} from "@openremote/or-mwc-components/or-mwc-input";import {getContentWithMenuTemplate} from "@openremote/or-mwc-components/or-mwc-menu";import {ListItem} from "@openremote/or-mwc-components/or-mwc-list";@@ -29,7 +29,6 @@ import "./or-rule-action-attribute";import "./or-rule-action-notification";import "./or-rule-action-webhook";import "./or-rule-action-alarm";-import {translate} from "@openremote/or-translate";const NOTIFICATION_COLOR = "4B87EA";const WAIT_COLOR = "EACC54";diff --git a/ui/component/or-rules/src/json-viewer/or-rule-when.ts b/ui/component/or-rules/src/json-viewer/or-rule-when.tsindex 382f91d51..d0bf94ef8 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-when.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-when.ts@@ -4,12 +4,11 @@ import {AssetDescriptor, JsonRule, LogicGroup, LogicGroupOperator, RuleConditionimport {OrRulesRuleUnsupportedEvent, RulesConfig} from "../index";import {buttonStyle} from "../style";import "./or-rule-condition";-import i18next from "i18next";+import {i18next, translate} from "@openremote/or-translate"import {InputType} from "@openremote/or-mwc-components/or-mwc-input";import {OrRulesJsonRuleChangedEvent} from "./or-rule-json-viewer";import {getWhenTypesMenu, updateRuleConditionType} from "./or-rule-condition";import {getContentWithMenuTemplate} from "@openremote/or-mwc-components/or-mwc-menu";-import { translate } from "@openremote/or-translate";enum ResetOption {NO_LONGER_MATCHES = "noLongerMatches",diff --git a/ui/component/or-rules/src/or-rule-validity.ts b/ui/component/or-rules/src/or-rule-validity.tsindex 502cc3a17..61abe93c5 100644--- a/ui/component/or-rules/src/or-rule-validity.ts+++ b/ui/component/or-rules/src/or-rule-validity.ts@@ -23,8 +23,7 @@ import {CalendarEvent, RulesetUnion, WellknownRulesetMetaItems} from "@openremotimport {OrRulesRuleChangedEvent} from "./index";import "@openremote/or-mwc-components/or-mwc-input";import {InputType, OrInputChangedEvent} from "@openremote/or-mwc-components/or-mwc-input";-import i18next from "i18next";-import {translate} from "@openremote/or-translate";+import {i18next, translate} from "@openremote/or-translate"import {OrMwcDialog, showDialog} from "@openremote/or-mwc-components/or-mwc-dialog";import {ByWeekday, RRule, Weekday} from 'rrule'diff --git a/ui/component/or-rules/src/or-rule-viewer.ts b/ui/component/or-rules/src/or-rule-viewer.tsindex eb10f1477..838735dac 100644--- a/ui/component/or-rules/src/or-rule-viewer.ts+++ b/ui/component/or-rules/src/or-rule-viewer.ts@@ -35,9 +35,8 @@ import "./or-rule-text-viewer";import "./or-rule-validity";import "./flow-viewer/components/flow-editor";import "@openremote/or-mwc-components/or-mwc-input";-import {translate} from "@openremote/or-translate";import {InputType, OrInputChangedEvent, OrMwcInput} from "@openremote/or-mwc-components/or-mwc-input";-import i18next from "i18next";+import {i18next, translate} from "@openremote/or-translate"import {GenericAxiosResponse} from "@openremote/rest";import {showErrorDialog} from "@openremote/or-mwc-components/or-mwc-dialog";import {project} from "./flow-viewer/components/flow-editor";diff --git a/ui/demo/demo-core/package.json b/ui/demo/demo-core/package.jsonindex bce0cf115..5e7b8fea8 100644--- a/ui/demo/demo-core/package.json+++ b/ui/demo/demo-core/package.json@@ -18,7 +18,6 @@"@openremote/model": "workspace:*","@openremote/or-icon": "workspace:*","@openremote/or-translate": "workspace:*",- "i18next": "^21.5.3","lit": "^3.3.1"},"devDependencies": {diff --git a/ui/demo/demo-core/src/index.ts b/ui/demo/demo-core/src/index.tsindex 2c99b8a07..784417896 100644--- a/ui/demo/demo-core/src/index.ts+++ b/ui/demo/demo-core/src/index.ts@@ -4,7 +4,7 @@ import manager, {Auth, Manager, OREvent, subscribe, Util} from "@openremote/coreimport "@openremote/or-icon";import "@openremote/or-translate";import {IconSets} from "@openremote/or-icon";-import i18next from "i18next";+import {i18next} from "@openremote/or-translate"import {AttributeEvent, WellknownMetaItems, SharedEvent, Asset, WellknownAssets, WellknownAttributes, AssetModelUtil} from "@openremote/model";import {getBuildingAsset, getElectricityChargerAsset, getElectricityConsumerAsset} from "./util";diff --git a/ui/test/package.json b/ui/test/package.jsonindex 482dfa363..dd9f291a8 100644--- a/ui/test/package.json+++ b/ui/test/package.json@@ -32,7 +32,6 @@"@sand4rt/experimental-ct-web": "1.54.2","css-loader": "^6.5.1","html-webpack-plugin": "^5.6.3",- "i18next": "^21.5.3","playwright": "1.54.2","playwright-core": "1.54.2","ts-loader": "~9.5.2",diff --git a/yarn.lock b/yarn.lockindex 09cad3850..26fc2067f 100644--- a/yarn.lock+++ b/yarn.lock@@ -12,7 +12,14 @@ __metadata:languageName: nodelinkType: hard-"@babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.9.2":+"@babel/runtime@npm:^7.17.2":+ version: 7.28.4+ resolution: "@babel/runtime@npm:7.28.4"+ checksum: 10c0/792ce7af9750fb9b93879cc9d1db175701c4689da890e6ced242ea0207c9da411ccf16dc04e689cc01158b28d7898c40d75598f4559109f761c12ce01e959bf7+ languageName: node+ linkType: hard++"@babel/runtime@npm:^7.9.2":version: 7.23.9resolution: "@babel/runtime@npm:7.23.9"dependencies:@@ -1354,7 +1361,6 @@ __metadata:"@openremote/util": "workspace:*""@rspack/cli": "npm:^1.4.4""@rspack/core": "npm:^1.4.4"- i18next: "npm:^21.5.3"lit: "npm:^3.3.1"typescript: "npm:^5.3.3"languageName: unknown@@ -1462,7 +1468,6 @@ __metadata:"@openremote/rest": "workspace:*""@openremote/util": "workspace:*""@reduxjs/toolkit": "npm:^1.8.1"- i18next: "npm:^21.5.3"iso-639-1: "npm:^3.1.3"lit: "npm:^3.3.1"maplibre-gl: "npm:^4.1.2"@@ -1489,7 +1494,6 @@ __metadata:"@openremote/util": "workspace:*""@reduxjs/toolkit": "npm:^1.8.1""@webcomponents/webcomponentsjs": "npm:^2.6.0"- i18next: "npm:^21.5.3"lit: "npm:^3.3.1"navigo: "npm:^8.11.1"pwa-helpers: "npm:^0.9.0"@@ -1544,7 +1548,6 @@ __metadata:"@openremote/or-translate": "workspace:*""@openremote/rest": "workspace:*"echarts: "npm:~5.6.0"- i18next: "npm:^21.5.3"lit: "npm:^3.3.1"moment: "npm:^2.29.4"languageName: unknown@@ -1561,10 +1564,10 @@ __metadata:"@openremote/or-chart": "workspace:*""@openremote/or-icon": "workspace:*""@openremote/or-mwc-components": "workspace:*"+ "@openremote/or-translate": "workspace:*""@openremote/rest": "workspace:*"chart.js: "npm:^3.6.0"chartjs-adapter-moment: "npm:^1.0.0"- i18next: "npm:^21.5.3"lit: "npm:^3.3.1"lodash: "npm:^4.17.21"moment: "npm:^2.29.4"@@ -1584,7 +1587,6 @@ __metadata:"@openremote/or-translate": "workspace:*""@openremote/rest": "workspace:*"echarts: "npm:~5.6.0"- i18next: "npm:^21.5.3"jsonpath-plus: "npm:^6.0.1"lit: "npm:^3.3.1"lodash: "npm:^4.17.21"@@ -1647,7 +1649,6 @@ __metadata:"@openremote/rest": "workspace:*""@types/offscreencanvas": "npm:^2019.6.4"echarts: "npm:~5.6.0"- i18next: "npm:^21.5.3"lit: "npm:^3.3.1"lodash: "npm:^4.17.21"moment: "npm:^2.29.4"@@ -1708,7 +1709,6 @@ __metadata:"@openremote/or-chart": "workspace:*""@openremote/or-components": "workspace:*""@openremote/or-translate": "workspace:*"- i18next: "npm:^21.5.3"lit: "npm:^3.3.1"languageName: unknownlinkType: soft@@ -1764,7 +1764,6 @@ __metadata:"@openremote/or-translate": "workspace:*"axios: "npm:0.24.0"http-link-header: "npm:^1.1.3"- i18next: "npm:^21.5.3"lit: "npm:^3.3.1"moment: "npm:^2.29.4"languageName: unknown@@ -1847,7 +1846,6 @@ __metadata:"@openremote/rest": "workspace:*""@types/shortid": "npm:^0.0.29"ace-builds: "npm:^1.41.0"- i18next: "npm:^21.5.3"iso-639-1: "npm:^3.1.3"linqts: "npm:^1.12.6"lit: "npm:^3.3.1"@@ -1972,7 +1970,6 @@ __metadata:"@sand4rt/experimental-ct-web": "npm:1.54.2"css-loader: "npm:^6.5.1"html-webpack-plugin: "npm:^5.6.3"- i18next: "npm:^21.5.3"playwright: "npm:1.54.2"playwright-core: "npm:1.54.2"ts-loader: "npm:~9.5.2"