Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Add languages files and add mobile back button to or-asset-viewer

robindekkersde26ad9eb360
diff --git a/deployment/manager/shared/locales/de/or.json b/deployment/manager/shared/locales/de/or.json
new file mode 100644
index 000000000..e5eb9d41f
--- /dev/null
+++ b/deployment/manager/shared/locales/de/or.json
@@ -0,0 +1,88 @@
+{
+ "asset": "Anlagegut",
+ "asset_plural": "Anlagegut",
+ "scenes": "Scenes",
+ "settings": "Settings",
+ "selectLanguage": "Select Language",
+ "logout": "Log out",
+ "login": "Log in",
+ "monday": "Monday",
+ "tuesday": "Tuesday",
+ "wednesday": "Wednesday",
+ "thursday": "Thursday",
+ "friday": "Friday",
+ "saturday": "Saturday",
+ "sunday": "Sunday",
+ "sceneStartTime": "Scene start time",
+ "sceneConfiguration": "Scene Configuration",
+ "temperature": "Temperature",
+ "enabled": "Enabled",
+ "disabled": "Disabled",
+ "scene": "Scene",
+ "user": "User",
+ "empty": "Has no value",
+ "notEmpty": "Has a value",
+ "equals": "Equals",
+ "notEquals": "Not equals",
+ "greaterThan": "Greater than",
+ "greaterEquals": "Greater than or equal to",
+ "lessThan": "Less than",
+ "lessEquals": "Less than or equal to",
+ "between": "Between",
+ "notBetween": "Is not between",
+ "contains": "Contains",
+ "notContains": "Does not contain",
+ "startsWith": "Starts with",
+ "notStartsWith": "Does not start with",
+ "endsWith": "Ends with",
+ "notEndsWith": "Does not end with",
+ "containsKey": "Contains key",
+ "notContainsKey": "Does not contain key",
+ "true": "Is true",
+ "false": "Is false",
+ "withinRadius": "Inside circle",
+ "outsideRadius": "Outside circle",
+ "withinRectangle": "Inside rectangle",
+ "outsideRectangle": "Outside rectangle",
+ "indexContains": "Array index contains",
+ "notIndexContains": "Array index does not contain",
+ "lengthEquals": "Array length equals",
+ "notLengthEquals": "Array length does not equal",
+ "lengthGreaterThan": "Array length greater than",
+ "lengthLessThan": "Array length less than",
+ "save": "Save",
+ "active": "Active",
+ "continueWithoutSaving": "If you continue, your changes will not be saved. Continue without saving?",
+ "confirmDelete": "Are you sure you want to delete?",
+ "when": "When",
+ "then": "Then",
+ "and": "and",
+ "or": "or",
+ "datetime": "Datetime",
+ "timer": "Timer",
+ "rulesEditorAddCondition": "Add condition",
+ "rulesEditorAddGroup": "Add group",
+ "rulesEditorAddAction": "Add action",
+ "sortBy": "Sort by",
+ "assetType": "Asset type",
+ "creationDate": "Creation date",
+ "status": "Status",
+ "name": "Name",
+ "deleteAssetsNoChildrenAllowed": "Only assets that have no descendants can be deleted, please remove descendents first.",
+ "confirmDeleteAssets": "Remove assets?",
+ "ok": "OK",
+ "cancel": "Cancel",
+ "createdOn": "Created on",
+ "accessPublicRead": "Public read",
+ "type": "Type",
+ "path": "Path",
+ "showOnMap": "Show on map",
+ "noAssetSelected": "Please select an asset on the left",
+ "loading": "Loading...",
+ "location": "Location",
+ "English": "English",
+ "Dutch": "Dutch",
+ "French": "French",
+ "German": "German",
+ "Spanish": "Spanish"
+}
\ No newline at end of file
diff --git a/deployment/manager/shared/locales/en/or.json b/deployment/manager/shared/locales/en/or.json
index 8679517b2..284f46016 100644
--- a/deployment/manager/shared/locales/en/or.json
+++ b/deployment/manager/shared/locales/en/or.json
@@ -1,12 +1,16 @@
{
+ "map": "Map",
+ "maps": "Maps",
+ "rule": "Rule",
+ "rules": "Rules",
"asset": "Asset",
"asset_plural": "Assets",
"attribute": "Attribute",
"scenes": "Scenes",
"settings": "Settings",
"selectLanguage": "Select Language",
- "logOut": "Log out",
- "logIn": "Log in",
+ "logout": "Log out",
+ "login": "Log in",
"monday": "Monday",
"tuesday": "Tuesday",
"wednesday": "Wednesday",
@@ -87,5 +91,10 @@
"month": "Month",
"year": "Year",
"period": "Period",
- "ending": "Ending"
+ "ending": "Ending",
+ "English": "English",
+ "Dutch": "Dutch",
+ "French": "French",
+ "German": "German",
+ "Spanish": "Spanish"
}
\ No newline at end of file
diff --git a/deployment/manager/shared/locales/es/or.json b/deployment/manager/shared/locales/es/or.json
new file mode 100644
index 000000000..8eecfc034
--- /dev/null
+++ b/deployment/manager/shared/locales/es/or.json
@@ -0,0 +1,88 @@
+{
+ "asset": "activo",
+ "asset_plural": "activo",
+ "scenes": "Scenes",
+ "settings": "Settings",
+ "selectLanguage": "Select Language",
+ "logout": "Log out",
+ "login": "Log in",
+ "monday": "Monday",
+ "tuesday": "Tuesday",
+ "wednesday": "Wednesday",
+ "thursday": "Thursday",
+ "friday": "Friday",
+ "saturday": "Saturday",
+ "sunday": "Sunday",
+ "sceneStartTime": "Scene start time",
+ "sceneConfiguration": "Scene Configuration",
+ "temperature": "Temperature",
+ "enabled": "Enabled",
+ "disabled": "Disabled",
+ "scene": "Scene",
+ "user": "User",
+ "empty": "Has no value",
+ "notEmpty": "Has a value",
+ "equals": "Equals",
+ "notEquals": "Not equals",
+ "greaterThan": "Greater than",
+ "greaterEquals": "Greater than or equal to",
+ "lessThan": "Less than",
+ "lessEquals": "Less than or equal to",
+ "between": "Between",
+ "notBetween": "Is not between",
+ "contains": "Contains",
+ "notContains": "Does not contain",
+ "startsWith": "Starts with",
+ "notStartsWith": "Does not start with",
+ "endsWith": "Ends with",
+ "notEndsWith": "Does not end with",
+ "containsKey": "Contains key",
+ "notContainsKey": "Does not contain key",
+ "true": "Is true",
+ "false": "Is false",
+ "withinRadius": "Inside circle",
+ "outsideRadius": "Outside circle",
+ "withinRectangle": "Inside rectangle",
+ "outsideRectangle": "Outside rectangle",
+ "indexContains": "Array index contains",
+ "notIndexContains": "Array index does not contain",
+ "lengthEquals": "Array length equals",
+ "notLengthEquals": "Array length does not equal",
+ "lengthGreaterThan": "Array length greater than",
+ "lengthLessThan": "Array length less than",
+ "save": "Save",
+ "active": "Active",
+ "continueWithoutSaving": "If you continue, your changes will not be saved. Continue without saving?",
+ "confirmDelete": "Are you sure you want to delete?",
+ "when": "When",
+ "then": "Then",
+ "and": "and",
+ "or": "or",
+ "datetime": "Datetime",
+ "timer": "Timer",
+ "rulesEditorAddCondition": "Add condition",
+ "rulesEditorAddGroup": "Add group",
+ "rulesEditorAddAction": "Add action",
+ "sortBy": "Sort by",
+ "assetType": "Asset type",
+ "creationDate": "Creation date",
+ "status": "Status",
+ "name": "Name",
+ "deleteAssetsNoChildrenAllowed": "Only assets that have no descendants can be deleted, please remove descendents first.",
+ "confirmDeleteAssets": "Remove assets?",
+ "ok": "OK",
+ "cancel": "Cancel",
+ "createdOn": "Created on",
+ "accessPublicRead": "Public read",
+ "type": "Type",
+ "path": "Path",
+ "showOnMap": "Show on map",
+ "noAssetSelected": "Please select an asset on the left",
+ "loading": "Loading...",
+ "location": "Location",
+ "English": "English",
+ "Dutch": "Dutch",
+ "French": "French",
+ "German": "German",
+ "Spanish": "Spanish"
+}
\ No newline at end of file
diff --git a/deployment/manager/shared/locales/fr/or.json b/deployment/manager/shared/locales/fr/or.json
new file mode 100644
index 000000000..2dacc3cdc
--- /dev/null
+++ b/deployment/manager/shared/locales/fr/or.json
@@ -0,0 +1,88 @@
+{
+ "asset": "Atout",
+ "asset_plural": "Atout",
+ "scenes": "Scenes",
+ "settings": "Settings",
+ "selectLanguage": "Select Language",
+ "logout": "Log out",
+ "login": "Log in",
+ "monday": "Monday",
+ "tuesday": "Tuesday",
+ "wednesday": "Wednesday",
+ "thursday": "Thursday",
+ "friday": "Friday",
+ "saturday": "Saturday",
+ "sunday": "Sunday",
+ "sceneStartTime": "Scene start time",
+ "sceneConfiguration": "Scene Configuration",
+ "temperature": "Temperature",
+ "enabled": "Enabled",
+ "disabled": "Disabled",
+ "scene": "Scene",
+ "user": "User",
+ "empty": "Has no value",
+ "notEmpty": "Has a value",
+ "equals": "Equals",
+ "notEquals": "Not equals",
+ "greaterThan": "Greater than",
+ "greaterEquals": "Greater than or equal to",
+ "lessThan": "Less than",
+ "lessEquals": "Less than or equal to",
+ "between": "Between",
+ "notBetween": "Is not between",
+ "contains": "Contains",
+ "notContains": "Does not contain",
+ "startsWith": "Starts with",
+ "notStartsWith": "Does not start with",
+ "endsWith": "Ends with",
+ "notEndsWith": "Does not end with",
+ "containsKey": "Contains key",
+ "notContainsKey": "Does not contain key",
+ "true": "Is true",
+ "false": "Is false",
+ "withinRadius": "Inside circle",
+ "outsideRadius": "Outside circle",
+ "withinRectangle": "Inside rectangle",
+ "outsideRectangle": "Outside rectangle",
+ "indexContains": "Array index contains",
+ "notIndexContains": "Array index does not contain",
+ "lengthEquals": "Array length equals",
+ "notLengthEquals": "Array length does not equal",
+ "lengthGreaterThan": "Array length greater than",
+ "lengthLessThan": "Array length less than",
+ "save": "Save",
+ "active": "Active",
+ "continueWithoutSaving": "If you continue, your changes will not be saved. Continue without saving?",
+ "confirmDelete": "Are you sure you want to delete?",
+ "when": "When",
+ "then": "Then",
+ "and": "and",
+ "or": "or",
+ "datetime": "Datetime",
+ "timer": "Timer",
+ "rulesEditorAddCondition": "Add condition",
+ "rulesEditorAddGroup": "Add group",
+ "rulesEditorAddAction": "Add action",
+ "sortBy": "Sort by",
+ "assetType": "Asset type",
+ "creationDate": "Creation date",
+ "status": "Status",
+ "name": "Name",
+ "deleteAssetsNoChildrenAllowed": "Only assets that have no descendants can be deleted, please remove descendents first.",
+ "confirmDeleteAssets": "Remove assets?",
+ "ok": "OK",
+ "cancel": "Cancel",
+ "createdOn": "Created on",
+ "accessPublicRead": "Public read",
+ "type": "Type",
+ "path": "Path",
+ "showOnMap": "Show on map",
+ "noAssetSelected": "Please select an asset on the left",
+ "loading": "Loading...",
+ "location": "Location",
+ "English": "English",
+ "Dutch": "Dutch",
+ "French": "French",
+ "German": "German",
+ "Spanish": "Spanish"
+}
\ No newline at end of file
diff --git a/deployment/manager/shared/locales/nl/or.json b/deployment/manager/shared/locales/nl/or.json
index cfb825998..b1b884b90 100644
--- a/deployment/manager/shared/locales/nl/or.json
+++ b/deployment/manager/shared/locales/nl/or.json
@@ -1,12 +1,16 @@
{
+ "map": "Kaart",
+ "maps": "Kaarten",
+ "rule": "Regel",
+ "rules": "Regels",
"asset": "Asset",
"asset_plural": "Assets",
"attribute": "Attribute",
"scenes": "Scenes",
"settings": "Instellingen",
"selectLanguage": "Taal kiezen",
- "logOut": "Uitloggen",
- "logIn": "Log in",
+ "logout": "Uitloggen",
+ "login": "Log in",
"monday": "maandag",
"tuesday": "dinsdag",
"wednesday": "woensdag",
@@ -87,5 +91,10 @@
"month": "Month",
"year": "Year",
"period": "Period",
- "ending": "Ending"
+ "ending": "Ending",
+ "English": "Engels",
+ "Dutch": "Nederlands",
+ "French": "Frans",
+ "German": "Duits",
+ "Spanish": "Spaans"
}
\ No newline at end of file
diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.ts
index 4ddb836e3..58a63ab62 100644
--- a/ui/component/or-asset-viewer/src/index.ts
+++ b/ui/component/or-asset-viewer/src/index.ts
@@ -215,6 +215,9 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem
return html`
<div id="wrapper">
<div id="asset-header">
+ <a class="back-navigation" @click="${() => window.history.back()}">
+ <or-icon icon="chevron-left"></or-icon>
+ </a>
<div id="title">
<or-icon title="${descriptor && descriptor.type ? descriptor.type : "unset"}" style="--or-icon-fill: ${descriptor && descriptor.color ? "#" + descriptor.color : "unset"}" icon="${descriptor && descriptor.icon ? descriptor.icon : AssetType.THING.icon}"></or-icon>${this.asset.name}
</div>
diff --git a/ui/component/or-asset-viewer/src/style.ts b/ui/component/or-asset-viewer/src/style.ts
index fb9ecf5f3..2e2b65821 100644
--- a/ui/component/or-asset-viewer/src/style.ts
+++ b/ui/component/or-asset-viewer/src/style.ts
@@ -146,8 +146,14 @@ export const style = css`
text-align: center;
height: 100%;
}
-
+ .back-navigation {
+ display: none;
+ cursor: pointer;
+ }
@media screen and (max-width: 769px) {
+ .back-navigation {
+ display: block;
+ }
.mobileHidden {
display: none;
@@ -157,7 +163,11 @@ export const style = css`
#asset-header {
grid-area: auto!important;
}
-
+
+ #asset-header {
+ padding: 20px 15px 0;
+ }
+
.panel {
padding: 16px;
border-radius: 0;
@@ -169,5 +179,7 @@ export const style = css`
grid-template-columns: 1fr!important;
padding: 20px 0;
}
+
+
}
`;
\ No newline at end of file