From dd4019c1726e8470aefb026f8da314d52cb18394 Mon Sep 17 00:00:00 2001 From: lolodomo Date: Mon, 1 Nov 2021 15:12:23 +0100 Subject: [PATCH] [openweathermap] Internationalization of discovery results (#11484) Signed-off-by: Laurent Garnier --- .../discovery/OpenWeatherMapDiscoveryService.java | 8 ++++---- .../main/resources/OH-INF/i18n/openweathermap.properties | 6 ++++-- .../resources/OH-INF/i18n/openweathermap_de.properties | 4 ++-- .../resources/OH-INF/i18n/openweathermap_fr.properties | 4 ++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/bundles/org.openhab.binding.openweathermap/src/main/java/org/openhab/binding/openweathermap/internal/discovery/OpenWeatherMapDiscoveryService.java b/bundles/org.openhab.binding.openweathermap/src/main/java/org/openhab/binding/openweathermap/internal/discovery/OpenWeatherMapDiscoveryService.java index 408978e3b7..905f966814 100644 --- a/bundles/org.openhab.binding.openweathermap/src/main/java/org/openhab/binding/openweathermap/internal/discovery/OpenWeatherMapDiscoveryService.java +++ b/bundles/org.openhab.binding.openweathermap/src/main/java/org/openhab/binding/openweathermap/internal/discovery/OpenWeatherMapDiscoveryService.java @@ -136,26 +136,26 @@ public class OpenWeatherMapDiscoveryService extends AbstractDiscoveryService { private void createWeatherAndForecastResult(String location, ThingUID bridgeUID) { thingDiscovered(DiscoveryResultBuilder.create(new ThingUID(THING_TYPE_WEATHER_AND_FORECAST, bridgeUID, LOCAL)) - .withLabel("Local Weather and Forecast").withProperty(CONFIG_LOCATION, location) + .withLabel("@text/discovery.weather-and-forecast.local.label").withProperty(CONFIG_LOCATION, location) .withRepresentationProperty(CONFIG_LOCATION).withBridge(bridgeUID).build()); } private void createAirPollutionResult(String location, ThingUID bridgeUID) { thingDiscovered(DiscoveryResultBuilder.create(new ThingUID(THING_TYPE_AIR_POLLUTION, bridgeUID, LOCAL)) - .withLabel("Local Air Pollution").withProperty(CONFIG_LOCATION, location) + .withLabel("@text/discovery.air-pollution.local.label").withProperty(CONFIG_LOCATION, location) .withRepresentationProperty(CONFIG_LOCATION).withBridge(bridgeUID).build()); } private void createOneCallResult(String location, ThingUID bridgeUID) { thingDiscovered( DiscoveryResultBuilder.create(new ThingUID(THING_TYPE_ONECALL_WEATHER_AND_FORECAST, bridgeUID, LOCAL)) - .withLabel("One Call API Weather and Forecast").withProperty(CONFIG_LOCATION, location) + .withLabel("@text/discovery.onecall.local.label").withProperty(CONFIG_LOCATION, location) .withRepresentationProperty(CONFIG_LOCATION).withBridge(bridgeUID).build()); } private void createOneCallHistoryResult(String location, ThingUID bridgeUID) { thingDiscovered(DiscoveryResultBuilder.create(new ThingUID(THING_TYPE_ONECALL_HISTORY, bridgeUID, LOCAL)) - .withLabel("One Call API History Data").withProperty(CONFIG_LOCATION, location) + .withLabel("@text/discovery.onecall-history.local.label").withProperty(CONFIG_LOCATION, location) .withRepresentationProperty(CONFIG_LOCATION).withBridge(bridgeUID).build()); } } diff --git a/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap.properties b/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap.properties index 1b17db9b56..cccfcbf471 100644 --- a/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap.properties +++ b/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap.properties @@ -360,5 +360,7 @@ offline.conf-error-not-supported-onecall-number-of-alerts = The 'numberOfAlerts' # discovery result -discovery.openweathermap.weather-and-forecast.api.local.label = Local Weather And Forecast -discovery.openweathermap.air-pollution.api.local.label = Local Air Pollution +discovery.weather-and-forecast.local.label = Local Weather and Forecast +discovery.air-pollution.local.label = Local Air Pollution +discovery.onecall.local.label = Local Weather and Forecast (One Call API) +discovery.onecall-history.local.label = Local History Data (One Call API) diff --git a/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap_de.properties b/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap_de.properties index 78b315aa30..7002b89633 100644 --- a/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap_de.properties +++ b/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap_de.properties @@ -424,5 +424,5 @@ offline.conf-error-not-supported-onecall-number-of-days = Der Parameter 'forecas offline.conf-error-not-supported-onecall-number-of-alerts = Der Parameter 'numberOfAlerts' muss größer oder gleich 0 sein. # discovery result -discovery.openweathermap.weather-and-forecast.api.local.label = Lokales Wetter und Wettervorhersage -discovery.openweathermap.air-pollution.api.local.label = Lokale Luftqualität +discovery.weather-and-forecast.local.label = Lokales Wetter und Wettervorhersage +discovery.air-pollution.local.label = Lokale Luftqualität diff --git a/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap_fr.properties b/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap_fr.properties index 1ebe61246a..9e8c25a277 100644 --- a/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap_fr.properties +++ b/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap_fr.properties @@ -257,5 +257,5 @@ offline.conf-error-not-supported-onecall-number-of-hours = Le paramètre 'foreca offline.conf-error-not-supported-onecall-number-of-days = Le paramètre 'forecastDays' doit être compris entre 0 et 7. # discovery result -discovery.openweathermap.weather-and-forecast.api.local.label = Météo locale et prévisions -discovery.openweathermap.uvindex.api.local.label = Indice UV local +discovery.weather-and-forecast.local.label = Météo locale et prévisions +discovery.air-pollution.local.label = Indice UV local -- 2.47.3