From 393a4c849b7ca61c99a1c872ca195021723b8959 Mon Sep 17 00:00:00 2001 From: Jacob Laursen Date: Sat, 24 Jan 2026 18:54:01 +0100 Subject: [PATCH 1/2] Inline I18N texts Signed-off-by: Jacob Laursen --- .../main/resources/OH-INF/config/config.xml | 116 +++++++++--------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/config/config.xml b/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/config/config.xml index e7866d83ae6e7..808f90ffb4a55 100644 --- a/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/config/config.xml +++ b/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/config/config.xml @@ -7,44 +7,44 @@ - - @text/config.clientId.description + + Client ID provided for the application you created on http://dev.netatmo.com/createapp - - @text/config.clientSecret.description + + Client Secret provided for the application you created. password - - @text/config.webHookUrl.description + + Protocol, public IP or hostname and port to access openHAB server from Internet. - - @text/config.webHookPostfix.description + + String appended to the generated webhook address (should start with `/`). - - @text/config.reconnectInterval.description + + The reconnection interval to Netatmo API (in s). 300 - - @text/config.period.sum_rain.description + + Observation period for summing rain quantities. - - - - - - + + + + + + 1week @@ -52,24 +52,24 @@ - - @text/config.limit.description + + Defines the requested boundary. - - + + MIN - - @text/config.period.measure.description + + Observation period for searched boundary. - - - - - - + + + + + + 1week @@ -77,20 +77,20 @@ - - @text/config.limit.description + + Defines the requested boundary. - - + + DATE_MIN - - @text/config.period.timestamp.description + + Observation period for the queried value. - - + + 1week @@ -98,19 +98,19 @@ - - @text/config.equipmentId.description + + ID of the device (MAC address). - - @text/config.equipmentId.description + + ID of the device (MAC address). - - @text/config.refreshInterval.description + + The refresh interval to poll Netatmo API (in seconds). 600 true @@ -118,44 +118,44 @@ - - @text/config.equipmentId.description + + ID of the device (MAC address). - - @text/config.ipAddress.description + + The IP or host name used as fallback in case of erroneous API answer to ping requests. network-address - - @text/config.thingId.description + + Unique identifier of the thing defined by Netatmo. - - @text/config.thingId.description + + Unique identifier of the thing defined by Netatmo. - - @text/config.securityId.description + + Unique identifier of the home handling security devices. true - - @text/config.energyId.description + + Unique identifier of the home handling energy devices. true - - @text/config.refreshInterval.description + + The refresh interval to poll Netatmo API (in seconds). 180 From 6380d333c413abcc4e6053178bcac9e6931be733 Mon Sep 17 00:00:00 2001 From: Jacob Laursen Date: Sat, 24 Jan 2026 18:57:39 +0100 Subject: [PATCH 2/2] Regenerate I18N properties Signed-off-by: Jacob Laursen --- .../resources/OH-INF/i18n/netatmo.properties | 84 +++++++++++++------ 1 file changed, 59 insertions(+), 25 deletions(-) diff --git a/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo.properties b/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo.properties index fcfcb3b1be360..a1f5bbb6b3ebe 100644 --- a/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo.properties +++ b/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo.properties @@ -353,6 +353,65 @@ channel-type.config.netatmo.live-stream-url.quality.option.low = Low Quality channel-type.config.netatmo.live-stream-url.quality.option.poor = Poor Quality channel-type.config.netatmo.live-stream-url.quality.option.high = High Quality +netatmo.config.api_bridge.clientId.label = Client ID +netatmo.config.api_bridge.clientId.description = Client ID provided for the application you created on http://dev.netatmo.com/createapp +netatmo.config.api_bridge.clientSecret.label = Client Secret +netatmo.config.api_bridge.clientSecret.description = Client Secret provided for the application you created. +netatmo.config.api_bridge.reconnectInterval.label = Reconnect Interval +netatmo.config.api_bridge.reconnectInterval.description = The reconnection interval to Netatmo API (in s). +netatmo.config.api_bridge.webHookPostfix.label = Webhook Postfix +netatmo.config.api_bridge.webHookPostfix.description = String appended to the generated webhook address (should start with `/`). +netatmo.config.api_bridge.webHookUrl.label = Webhook Address +netatmo.config.api_bridge.webHookUrl.description = Protocol, public IP or hostname and port to access openHAB server from Internet. +netatmo.config.camera.id.label = Equipment ID +netatmo.config.camera.id.description = ID of the device (MAC address). +netatmo.config.camera.ipAddress.label = Network Address +netatmo.config.camera.ipAddress.description = The IP or host name used as fallback in case of erroneous API answer to ping requests. +netatmo.config.device.id.label = Equipment ID +netatmo.config.device.id.description = ID of the device (MAC address). +netatmo.config.home.energyId.label = Energy ID +netatmo.config.home.energyId.description = Unique identifier of the home handling energy devices. +netatmo.config.home.id.label = Thing ID +netatmo.config.home.id.description = Unique identifier of the thing defined by Netatmo. +netatmo.config.home.refreshInterval.label = Refresh Interval +netatmo.config.home.refreshInterval.description = The refresh interval to poll Netatmo API (in seconds). +netatmo.config.home.securityId.label = Security ID +netatmo.config.home.securityId.description = Unique identifier of the home handling security devices. +netatmo.config.measure.config.limit.label = Boundary +netatmo.config.measure.config.limit.description = Defines the requested boundary. +netatmo.config.measure.config.limit.option.MIN = Minimum +netatmo.config.measure.config.limit.option.MAX = Maximum +netatmo.config.measure.config.period.label = Period +netatmo.config.measure.config.period.description = Observation period for searched boundary. +netatmo.config.measure.config.period.option.30min = 30 minutes +netatmo.config.measure.config.period.option.1hour = 1 hour +netatmo.config.measure.config.period.option.3hours = 3 hours +netatmo.config.measure.config.period.option.1day = This day +netatmo.config.measure.config.period.option.1week = This week +netatmo.config.measure.config.period.option.1month = This month +netatmo.config.sum_rain.config.period.label = Period +netatmo.config.sum_rain.config.period.description = Observation period for summing rain quantities. +netatmo.config.sum_rain.config.period.option.30min = 30 minutes +netatmo.config.sum_rain.config.period.option.1hour = 1 hour +netatmo.config.sum_rain.config.period.option.3hours = 3 hours +netatmo.config.sum_rain.config.period.option.1day = This day +netatmo.config.sum_rain.config.period.option.1week = This week +netatmo.config.sum_rain.config.period.option.1month = This month +netatmo.config.timestamp.config.limit.label = Boundary +netatmo.config.timestamp.config.limit.description = Defines the requested boundary. +netatmo.config.timestamp.config.limit.option.DATE_MIN = Timestamp of minimum +netatmo.config.timestamp.config.limit.option.DATE_MAX = Timestamp of maximum +netatmo.config.timestamp.config.period.label = Period +netatmo.config.timestamp.config.period.description = Observation period for the queried value. +netatmo.config.timestamp.config.period.option.1week = This week +netatmo.config.timestamp.config.period.option.1month = This month +netatmo.config.virtual.id.label = Thing ID +netatmo.config.virtual.id.description = Unique identifier of the thing defined by Netatmo. +netatmo.config.weather.id.label = Equipment ID +netatmo.config.weather.id.description = ID of the device (MAC address). +netatmo.config.weather.refreshInterval.label = Refresh Interval +netatmo.config.weather.refreshInterval.description = The refresh interval to poll Netatmo API (in seconds). + # channel types config config.limit.label = Boundary @@ -430,31 +489,6 @@ thing-type.netatmo.welcome.description = The Netatmo Smart Indoor Camera (Welcom thing-type.netatmo.wind.label = Wind Gauge Module thing-type.netatmo.wind.description = Wind sensor reporting wind angle and strength. -# thing configuration - -config.clientId.label = Client ID -config.clientId.description = Client ID provided for the application you created on http://dev.netatmo.com/createapp -config.clientSecret.label = Client Secret -config.clientSecret.description = Client Secret provided for the application you created. -config.webHookPostfix.label = Webhook Postfix -config.webHookPostfix.description = String appended to the generated webhook address (should start with `/`). -config.webHookUrl.label = Webhook Address -config.webHookUrl.description = Protocol, public IP or hostname and port to access openHAB server from Internet. -config.reconnectInterval.label = Reconnect Interval -config.reconnectInterval.description = The reconnection interval to Netatmo API (in s). -config.equipmentId.label = Equipment ID -config.equipmentId.description = ID of the device (MAC address). -config.ipAddress.label = Network Address -config.ipAddress.description = The IP or host name used as fallback in case of erroneous API answer to ping requests. -config.thingId.label = Thing ID -config.thingId.description = Unique identifier of the thing defined by Netatmo. -config.securityId.label = Security ID -config.securityId.description = Unique identifier of the home handling security devices. -config.energyId.label = Energy ID -config.energyId.description = Unique identifier of the home handling energy devices. -config.refreshInterval.label = Refresh Interval -config.refreshInterval.description = The refresh interval to poll Netatmo API (in seconds). - # error messages conf-error-no-client-id = Cannot connect to Netatmo bridge as no client id is available in the configuration