[openweathermap] Internationalization of discovery results (openhab#1…

…1484) Signed-off-by: Laurent Garnier <lg.hc@free.fr> Signed-off-by: Dave J Schoepel <dave@theschoepels.com>
dschoepel · Nov 9, 2021 · ff4b1fb · ff4b1fb
1 parent 15b168a
commit ff4b1fb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/...org/openhab/binding/openweathermap/internal/discovery/OpenWeatherMapDiscoveryService.java b/...org/openhab/binding/openweathermap/internal/discovery/OpenWeatherMapDiscoveryService.java
@@ -136,26 +136,26 @@ private void createResults(PointType location) {
 
     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/...g.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap.properties b/...g.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/...penhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap_de.properties b/...penhab.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/...penhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap_fr.properties b/...penhab.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