Fix unreachable lights and sensors being marked as GONE. (#12245)

Fixes #12244

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>

diff --git a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/LightThingHandler.java b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/LightThingHandler.java
index 4b224d3ea5541bbeaa00cea859cf06984a788b14..3f1d92f958b0e4a41ae41ca3a8ea12d63f802db5 100644 (file)
--- a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/LightThingHandler.java
+++ b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/LightThingHandler.java
@@ -464,7 +464,7 @@ public class LightThingHandler extends DeconzBaseThingHandler {
                     updateStatus(ThingStatus.ONLINE);
                     thing.getChannels().stream().map(c -> c.getUID().getId()).forEach(c -> valueUpdated(c, lightState));
                 } else {
-                    updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.GONE, "Not reachable");
+                    updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.NONE, "@text/offline.light-not-reachable");
                     thing.getChannels().stream().map(c -> c.getUID()).forEach(c -> updateState(c, UnDefType.UNDEF));
                 }
             }

diff --git a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/SensorBaseThingHandler.java b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/SensorBaseThingHandler.java
index 00e58a06f0d5a5c104a24c7885d4ad91e65ccee6..58765a0aa1bc06339fda9dfe18eaab73cb8a0739 100644 (file)
--- a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/SensorBaseThingHandler.java
+++ b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/SensorBaseThingHandler.java
@@ -116,7 +116,7 @@ public abstract class SensorBaseThingHandler extends DeconzBaseThingHandler {
 
         // Add some information about the sensor
         if (!sensorConfig.reachable) {
-            updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.GONE, "Not reachable");
+            updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.NONE, "@text/offline.sensor-not-reachable");
             return;
         }
 

diff --git a/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/i18n/deconz.properties b/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/i18n/deconz.properties
index 5433e4710f5e560de9acb543fa309e0177c9c000..b20e6691bc0a08987ad5579a1991568f46cfbeab 100644 (file)
--- a/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/i18n/deconz.properties
+++ b/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/i18n/deconz.properties
@@ -196,3 +196,8 @@ channel-type.deconz.voltage.label = Voltage
 channel-type.deconz.voltage.description = Current voltage
 channel-type.deconz.waterleakage.label = Water Leakage
 channel-type.deconz.waterleakage.description = Water leakage detected
+
+# thing status descriptions
+
+offline.light-not-reachable = Not reachable
+offline.sensor-not-reachable = Not reachable