Skip to content

armgit / core

Public Imported from GitHub
0

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

GWT manager i18n update for asset types

Rich Turner25f060a39599
diff --git a/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditImpl.java b/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditImpl.java
index 6e5efd6ff..84efa5957 100644
--- a/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditImpl.java
+++ b/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditImpl.java
@@ -201,7 +201,7 @@ public class AssetEditImpl extends FormViewImpl implements AssetEdit {
new AbstractRenderer<AssetDescriptor>() {
@Override
public String render(AssetDescriptor assetType) {
- return assetType != null ? environment.getMessages().assetTypeLabel(assetType.getName()) : "";
+ return assetType == null ? "" : environment.getMessages().assetTypeLabel(assetType.getName()).equals("") ? assetType.getName() : environment.getMessages().assetTypeLabel(assetType.getName());
}
}
);
@@ -449,7 +449,9 @@ public class AssetEditImpl extends FormViewImpl implements AssetEdit {
if (assetType == null) {
headline.setSub(type);
} else {
- headline.setSub(managerMessages.assetTypeLabel(assetType.getName()));
+ headline.setSub(
+ managerMessages.assetTypeLabel(assetType.getName()).equals("") ? assetType.getName() : managerMessages.assetTypeLabel(assetType.getName())
+ );
}
}
diff --git a/client/src/main/java/org/openremote/app/client/assets/asset/AssetViewImpl.java b/client/src/main/java/org/openremote/app/client/assets/asset/AssetViewImpl.java
index c55a78a6f..16a65829c 100644
--- a/client/src/main/java/org/openremote/app/client/assets/asset/AssetViewImpl.java
+++ b/client/src/main/java/org/openremote/app/client/assets/asset/AssetViewImpl.java
@@ -375,7 +375,9 @@ public class AssetViewImpl extends Composite implements AssetView {
if (assetType == null) {
headline.setSub(type);
} else {
- headline.setSub(managerMessages.assetTypeLabel(assetType.name()));
+ headline.setSub(
+ managerMessages.assetTypeLabel(assetType.getName()).equals("") ? assetType.getName() : managerMessages.assetTypeLabel(assetType.getName())
+ );
}
}
diff --git a/client/src/main/resources/org/openremote/app/client/i18n/ManagerMessages.properties b/client/src/main/resources/org/openremote/app/client/i18n/ManagerMessages.properties
index 019e9cc9a..8c6740da8 100644
--- a/client/src/main/resources/org/openremote/app/client/i18n/ManagerMessages.properties
+++ b/client/src/main/resources/org/openremote/app/client/i18n/ManagerMessages.properties
@@ -94,18 +94,25 @@ invalidAssetParent=Invalid asset parent, please change your selection.
centerMap=Locate
showHistory=History
sort=Sort
-assetTypeLabel=Unknown asset type
-assetTypeLabel[CUSTOM]=Custom
-assetTypeLabel[TENANT]=Tenant
+assetTypeLabel=
assetTypeLabel[BUILDING]=Building
+assetTypeLabel[CITY]=City
+assetTypeLabel[AREA]=Area
assetTypeLabel[FLOOR]=Floor
assetTypeLabel[RESIDENCE]=Residence
assetTypeLabel[ROOM]=Room
-assetTypeLabel[FLIGHT]=Flight
-assetTypeLabel[PIER]=Pier
assetTypeLabel[AGENT]=Agent
-assetTypeLabel[THING]=Thing
assetTypeLabel[CONSOLE]=Console
+assetTypeLabel[MICROPHONE]=Microphone
+assetTypeLabel[SOUND_EVENT]=Sound event
+assetTypeLabel[ENVIRONMENT_SENSOR]=Environment sensor
+assetTypeLabel[LIGHT]=Light
+assetTypeLabel[LIGHT_CONTROLLER]=Light controller
+assetTypeLabel[PEOPLE_COUNTER]=People counter
+assetTypeLabel[GATEWAY]=Gateway
+assetTypeLabel[GROUP]=Group
+assetTypeLabel[CUSTOM]=Custom
+assetTypeLabel[THING]=Thing
enterCustomAssetType=Enter a custom type value
read=Read
write=Write