[openwebnet] Fixes discovery of devices on local bus. Added it translation (#11644)

Signed-off-by: Massimo Valla <mvcode00@gmail.com>

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/OpenWebNetDeviceDiscoveryService.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/OpenWebNetDeviceDiscoveryService.java
index e6857d837de468f325ac9403f05046e3eb74d6d8..2c75705e40ab27ff8ccd1fd23a39db528f78c46c 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/OpenWebNetDeviceDiscoveryService.java
+++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/OpenWebNetDeviceDiscoveryService.java
@@ -188,7 +188,7 @@ public class OpenWebNetDeviceDiscoveryService extends AbstractDiscoveryService
 
         DiscoveryResult discoveryResult = null;
 
-        String whereConfig = bridgeHandler.normalizeWhere(where);
+        String whereConfig = where.value();
         if (where instanceof WhereZigBee && WhereZigBee.UNIT_02.equals(((WhereZigBee) where).getUnit())) {
             logger.debug("UNIT=02 found (WHERE={}) -> will remove previous result if exists", where);
             thingRemoved(thingUID); // remove previously discovered thing

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetBridgeHandler.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetBridgeHandler.java
index 7908f63d84b163f1d5fb18aa660082f02d86282c..5bf23e76ee3806aed23d4270306c828aeace9b36 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetBridgeHandler.java
+++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetBridgeHandler.java
@@ -600,7 +600,7 @@ public class OpenWebNetBridgeHandler extends ConfigStatusBridgeHandler implement
     }
 
     /**
-     * Normalize a Where address
+     * Normalize a Where address to generate ownId and Thing id
      *
      * @param where the Where address
      * @return the normalized address as String

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet.properties b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet.properties
index be9950b25e8f591bf37550190cdff185dc3afdb8..bf3bac400e37d616aaf79efacc2df91d353707d6 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet.properties
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet.properties
@@ -1,12 +1,18 @@
-# Thing status descriptions
-offline.conf-error-no-ip-address = Cannot connect to gateway. No host/IP has been provided in Bridge configuration.
-offline.conf-error-no-serial-port = Cannot connect to gateway. No serial port has been provided in Bridge configuration.
-offline.conf-error-where = WHERE parameter in Thing configuration is null or invalid
-offline.conf-error-no-bridge = No bridge associated, please assign a bridge in Thing configuration.
-offline.conf-error-auth = Authentication error. Check gateway password in Thing Configuration Parameters
-
-offline.comm-error-disconnected = Disconnected from gateway
-offline.comm-error-timeout = Connection to gateway timed out
-offline.comm-error-connection = Could not connect to gateway 
+# binding
+
+binding.openwebnet.name = OpenWebNet (BTicino/Legrand) Binding
+binding.openwebnet.description = The OpenWebNet binding integrates BTicino (Legrand) MyHOME® BUS and wireless systems using the OpenWebNet protocol.
+
+# thing status descriptions
+
+offline.conf-error-no-ip-address = Cannot connect to gateway. No host/IP address has been provided in configuration.
+offline.conf-error-no-serial-port = Cannot connect to gateway. No serial port has been provided in configuration.
+offline.conf-error-where = OpenWebNet Address (where) parameter in configuration is null or invalid.
+offline.conf-error-no-bridge = No bridge associated. Assign a bridge in configuration.
+offline.conf-error-auth = Authentication failed. Check gateway password in configuration.
+
+offline.comm-error-disconnected = Disconnected from gateway.
+offline.comm-error-timeout = Connection to gateway timed out.
+offline.comm-error-connection = Could not connect to gateway.
 
 unknown.waiting-state = Waiting state update...

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet_hu.properties b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet_hu.properties
index 9a6cce7256250eee99c1b4d476302a1d61b61cf8..83fd55f249834be727a234bc0f84c1f4824dcbd3 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet_hu.properties
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet_hu.properties
@@ -1,7 +1,7 @@
 # Thing status descriptions
 offline.conf-error-no-ip-address = Nem lehet az átjáróhoz csatlakozni. Nincs gazdanév/IP megadva a híd konfigurációjában.
 offline.conf-error-no-serial-port = Nem lehet az átjáróhoz csatlakozni. Nincs soros port megadva a híd konfigurációjában.
-offline.conf-error-where = WHERE paraméter a dolog konfigurációjában null vagy érvénytelen
+offline.conf-error-where = OpenWebNet Address (where) paraméter a dolog konfigurációjában null vagy érvénytelen
 offline.conf-error-no-bridge = Nincs híd hozzárendelve, a dolog konfigurációjában adjon meg egyet.
 offline.conf-error-auth = Hitelesítési hiba. Ellenőrizze az átjáró jelszavát a dolog beállítási paramétereiben
 

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet_it.properties b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet_it.properties
new file mode 100644 (file)
index 0000000..666f18c
--- /dev/null
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet_it.properties
@@ -0,0 +1,18 @@
+# binding
+
+binding.openwebnet.name = OpenWebNet (BTicino/Legrand) Binding
+binding.openwebnet.description = Il binding OpenWebNet integra i sistemi BTicino (Legrand) MyHOME® BUS e wireless tramite il protocollo OpenWebNet.
+
+# thing status descriptions
+
+offline.conf-error-no-ip-address = Impossibile connettersi al gateway. Nessun host/IP specificato nella configurazione.
+offline.conf-error-no-serial-port = Impossibile connettersi al gateway. Nessuna porta seriale specificata nella configurazione.
+offline.conf-error-where = Il parametro OpenWebNet Address (where) nella configurazione è nullo o non valido.
+offline.conf-error-no-bridge = Nessun bridge associato. Assegnare un bridge nella configurazione.
+offline.conf-error-auth = Autenticazione fallita. Verificare la password nella configurazione.
+
+offline.comm-error-disconnected = Disconnesso dal gateway.
+offline.comm-error-timeout = Connessione al gateway non riuscita in tempo.
+offline.comm-error-connection = Impossibile connettersi al gateway.
+
+unknown.waiting-state = In attesa di aggiornamento di stato...