[lgwebos] Add default translations to properties file (#11449)

Allows translating the binding strings with Crowdin.

Also fixes a wrong thing action description annotation.

Also fixes few SAT warnings

Signed-off-by: Laurent Garnier <lg.hc@free.fr>

bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/action/LGWebOSActions.java

@@ -101,7 +101,7 @@ public class LGWebOSActions implements ThingActions {
         getConnectedSocket().ifPresent(control -> control.showToast(text, createResponseListener()));
     }
 
-    @RuleAction(label = "@text/actionShowToastWithIconLabel", description = "@text/actionShowToastWithIconLabel")
+    @RuleAction(label = "@text/actionShowToastWithIconLabel", description = "@text/actionShowToastWithIconDesc")
     public void showToast(
             @ActionInput(name = "icon", label = "@text/actionShowToastInputIconLabel", description = "@text/actionShowToastInputIconDesc") String icon,
             @ActionInput(name = "text", label = "@text/actionShowToastInputTextLabel", description = "@text/actionShowToastInputTextDesc") String text)
@@ -164,7 +164,6 @@ public class LGWebOSActions implements ThingActions {
                 logger.warn("Device with ThingID {} does not support any app with id: {}.",
                         getLGWebOSHandler().getThing().getUID(), appId);
             }
-
         } catch (JsonParseException ex) {
             logger.warn("Parameters value ({}) is not in a valid JSON format. {}", params, ex.getMessage());
             return;

bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/discovery/LGWebOSUpnpDiscoveryParticipant.java

@@ -63,7 +63,7 @@ public class LGWebOSUpnpDiscoveryParticipant implements UpnpDiscoveryParticipant
         return DiscoveryResultBuilder.create(thingUID).withLabel(device.getDetails().getFriendlyName())
                 .withProperty(PROPERTY_DEVICE_ID, device.getIdentity().getUdn().getIdentifierString())
                 .withProperty(CONFIG_HOST, device.getIdentity().getDescriptorURL().getHost())
-                .withLabel(device.getDetails().getFriendlyName()).withProperty(Thing.PROPERTY_MODEL_ID, modelName)
+                .withProperty(Thing.PROPERTY_MODEL_ID, modelName)
                 .withProperty(Thing.PROPERTY_VENDOR, device.getDetails().getManufacturerDetails().getManufacturer())
                 .withRepresentationProperty(PROPERTY_DEVICE_ID).withThingType(THING_TYPE_WEBOSTV).build();
     }

bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/handler/LGWebOSHandler.java

@@ -76,11 +76,6 @@ public class LGWebOSHandler extends BaseThingHandler
     private static final int CHANNEL_SUBSCRIPTION_DELAY_SECONDS = 1;
     private static final String APP_ID_LIVETV = "com.webos.app.livetv";
 
-    /*
-     * error messages
-     */
-    private static final String MSG_MISSING_PARAM = "Missing parameter \"host\"";
-
     private final Logger logger = LoggerFactory.getLogger(LGWebOSHandler.class);
 
     // ChannelID to CommandHandler Map
@@ -135,7 +130,8 @@ public class LGWebOSHandler extends BaseThingHandler
         logger.trace("Handler initialized with config {}", c);
         String host = c.getHost();
         if (host.isEmpty()) {
-            updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, MSG_MISSING_PARAM);
+            updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR,
+                    "@text/offline.config-error-unknown-host");
             return;
         }
 
@@ -143,7 +139,7 @@ public class LGWebOSHandler extends BaseThingHandler
         s.setListener(this);
         socket = s;
 
-        updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.NONE, "TV is off");
+        updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.NONE, "@text/offline.tv-off");
 
         startReconnectJob();
     }
@@ -284,7 +280,7 @@ public class LGWebOSHandler extends BaseThingHandler
                 postUpdate(CHANNEL_POWER, OnOffType.OFF);
                 break;
             case DISCONNECTED:
-                updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.NONE, "TV is off");
+                updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.NONE, "@text/offline.tv-off");
                 channelHandlers.forEach((k, v) -> {
                     v.onDeviceRemoved(k, this);
                     v.removeAnySubscription(this);
@@ -297,13 +293,12 @@ public class LGWebOSHandler extends BaseThingHandler
                 stopReconnectJob();
                 break;
             case REGISTERING:
-                updateStatus(ThingStatus.ONLINE, ThingStatusDetail.NONE,
+                updateStatus(ThingStatus.ONLINE, ThingStatusDetail.NONE, "@text/online.registering");
-                        "Registering - You may need to confirm pairing on TV.");
                 findMacAddress();
                 break;
             case REGISTERED:
                 startKeepAliveJob();
-                updateStatus(ThingStatus.ONLINE, ThingStatusDetail.NONE, "Connected");
+                updateStatus(ThingStatus.ONLINE, ThingStatusDetail.NONE, "@text/online.connected");
 
                 channelHandlers.forEach((k, v) -> {
                     // refresh subscriptions except on channel, which can only be subscribe in livetv app. see
@@ -330,7 +325,8 @@ public class LGWebOSHandler extends BaseThingHandler
             case CONNECTING:
             case REGISTERING:
             case REGISTERED:
-                updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, "Connection Failed: " + error);
+                updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR,
+                        String.format("@text/offline.comm-error-connexion-failed [ \"%s\" ]", error));
                 break;
         }
     }

bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/handler/LGWebOSTVSocket.java

@@ -521,10 +521,8 @@ public class LGWebOSTVSocket {
     }
 
     private Float volumeFromResponse(JsonObject jsonObj) {
-        final String VOLUME_STATUS = "volumeStatus";
+        JsonObject parent = jsonObj.has("volumeStatus") ? jsonObj.getAsJsonObject("volumeStatus") : jsonObj;
-        final String VOLUME = "volume";
+        return parent.get("volume").getAsInt() >= 0 ? (float) (parent.get("volume").getAsInt() / 100.0) : Float.NaN;
-        JsonObject parent = jsonObj.has(VOLUME_STATUS) ? jsonObj.getAsJsonObject(VOLUME_STATUS) : jsonObj;
-        return parent.get(VOLUME).getAsInt() >= 0 ? (float) (parent.get(VOLUME).getAsInt() / 100.0) : Float.NaN;
     }
 
     public ServiceSubscription<Float> subscribeVolume(ResponseListener<Float> listener) {

bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/handler/core/TextInputStatusInfo.java

@@ -81,17 +81,15 @@ public class TextInputStatusInfo {
     public TextInputType getTextInputType() {
         TextInputType textInputType = TextInputType.DEFAULT;
 
-        if (contentType != null) {
+        if ("number".equals(contentType)) {
-            if (contentType.equals("number")) {
             textInputType = TextInputType.NUMBER;
-            } else if (contentType.equals("phonenumber")) {
+        } else if ("phonenumber".equals(contentType)) {
             textInputType = TextInputType.PHONE_NUMBER;
-            } else if (contentType.equals("url")) {
+        } else if ("url".equals(contentType)) {
             textInputType = TextInputType.URL;
-            } else if (contentType.equals("email")) {
+        } else if ("email".equals(contentType)) {
             textInputType = TextInputType.EMAIL;
         }
-        }
 
         return textInputType;
     }

bundles/org.openhab.binding.lgwebos/src/main/resources/OH-INF/i18n/lgwebos.properties

@@ -1,45 +1,78 @@
-actionShowToastLabel=show a toast message
+# binding
-actionShowToastDesc=Sends a toast message to a WebOS device with openHAB icon.
-actionShowToastInputTextLabel=Text
-actionShowToastInputTextDesc=The text to display
 
-actionShowToastWithIconLabel=show a toast message with icon
+binding.lgwebos.name = LG webOS Binding
-actionShowToastWithIconLabel=Sends a toast message to a WebOS device with custom icon.
+binding.lgwebos.description = Binding to connect LG's WebOS based smart TVs
-actionShowToastInputIconLabel=Icon
-actionShowToastInputIconDesc=The URL to the icon to display
 
-actionLaunchBrowserLabel=launch the browser
+# thing types
-actionLaunchBrowserDesc=Opens the given URL in the TV's browser application.
-actionLaunchBrowserInputUrlLabel=URL
-actionLaunchBrowserInputUrlDesc=The URL to open
 
+thing-type.lgwebos.WebOSTV.label = WebOS TV
+thing-type.lgwebos.WebOSTV.description = WebOS based smart TV
+
+# thing types config
+
+thing-type.config.lgwebos.WebOSTV.host.label = Host
+thing-type.config.lgwebos.WebOSTV.host.description = Hostname or IP address of TV.
+thing-type.config.lgwebos.WebOSTV.key.label = Access Key
+thing-type.config.lgwebos.WebOSTV.key.description = Key exchanged with TV after pairing.
+thing-type.config.lgwebos.WebOSTV.macAddress.label = MAC Address
+thing-type.config.lgwebos.WebOSTV.macAddress.description = If MAC Address of TV is entered here, the binding will attempt to power on the device via Wake On Lan (WOL), when it receives command ON on channel power. Accepted value is six groups of two hexadecimal digits, separated by hyphens or colons, e.g '3c:cd:93:c2:20:e0'.)
+
+# channel types
+
+channel-type.lgwebos.appLauncherChannelType.label = Application
+channel-type.lgwebos.appLauncherChannelType.description = Start application and monitor running applications.
+channel-type.lgwebos.channelType.label = Channel
+channel-type.lgwebos.channelType.description = Current Channel
+channel-type.lgwebos.mediaStopType.label = Stop
+channel-type.lgwebos.mediaStopType.description = Stop Playback
+channel-type.lgwebos.rcButtonType.label = RCButton
+channel-type.lgwebos.rcButtonType.description = Simulate a Remote Control button press
+channel-type.lgwebos.toastType.label = Toast
+channel-type.lgwebos.toastType.description = Send a message onto the TV screen.
+
+# thing actions
+
+actionDecreaseChannelLabel = switch one channel down
+actionDecreaseChannelDesc = TV will switch one channel down in the current channel list.
+actionIncreaseChannelLabel = switch one channel up
+actionIncreaseChannelDesc = TV will switch one channel up in the current channel list.
 actionLaunchApplicationLabel = launch an application
 actionLaunchApplicationDesc = Opens the application with given Application ID.
 actionLaunchApplicationInputAppIDLabel = Application ID
 actionLaunchApplicationInputAppIDDesc = The Application ID
-
 actionLaunchApplicationWithParamsLabel = launch an application with parameters
 actionLaunchApplicationWithParamsDesc = Opens the application with given Application ID and passes additional parameters.
 actionLaunchApplicationInputParamsLabel = JSON Parameters
 actionLaunchApplicationInputParamsDesc = The parameters to hand over to the application in JSON format
-
+actionLaunchBrowserLabel = launch the browser
-actionSendTextLabel=send a text input
+actionLaunchBrowserDesc = Opens the given URL in the TV's browser application.
-actionSendTextDesc=Sends a text input to a WebOS device.
+actionLaunchBrowserInputUrlLabel = URL
-actionSendTextInputTextLabel=Text
+actionLaunchBrowserInputUrlDesc = The URL to open
-actionSendTextInputTextDesc=The text to input
-
 actionSendButtonLabel = send a button press
 actionSendButtonDesc = Sends a button press event to a WebOS device.
 actionSendButtonInputButtonLabel = Button
 actionSendButtonInputButtonDesc = Can be one of UP, DOWN, LEFT, RIGHT, BACK, DELETE, ENTER, HOME, or OK
-
-actionIncreaseChannelLabel=switch one channel up
-actionIncreaseChannelDesc=TV will switch one channel up in the current channel list.
-
-actionDecreaseChannelLabel=switch one channel down
-actionDecreaseChannelDesc=TV will switch one channel down in the current channel list.
-
 actionSendRCButtonLabel = simulate remote control button press
 actionSendRCButtonDesc = Simulates pressing of a Remote Control Button.
 actionSendRCButtonInputTextLabel = Remote Control button name
 actionSendRCButtonInputTextDesc = The Remote Control button name to send to the WebOS device.
+actionSendTextLabel = send a text input
+actionSendTextDesc = Sends a text input to a WebOS device.
+actionSendTextInputTextLabel = Text
+actionSendTextInputTextDesc = The text to input
+actionShowToastLabel = show a toast message
+actionShowToastDesc = Sends a toast message to a WebOS device with openHAB icon.
+actionShowToastInputTextLabel = Text
+actionShowToastInputTextDesc = The text to display
+actionShowToastWithIconLabel = show a toast message with icon
+actionShowToastWithIconDesc = Sends a toast message to a WebOS device with custom icon.
+actionShowToastInputIconLabel = Icon
+actionShowToastInputIconDesc = The URL to the icon to display
+
+# Thing status descriptions
+
+offline.config-error-unknown-host = Missing parameter "host"
+offline.comm-error-connexion-failed = Connection Failed: {0}
+offline.tv-off = TV is off
+online.registering = Registering - You may need to confirm pairing on TV.
+online.connected = Connected

bundles/org.openhab.binding.lgwebos/src/main/resources/OH-INF/i18n/lgwebos_fr.properties

@@ -1,44 +1,37 @@
-actionShowToastLabel=affiche un message à l'écran
+# thing actions
-actionShowToastDesc=Envoie un message à afficher avec l'icône openHAB à un appareil WebOS.
-actionShowToastInputTextLabel=Texte
-actionShowToastInputTextDesc=Le texte à afficher
-
-actionShowToastWithIconLabel=Envoie un message à afficher avec une icône personnalisée à un appareil WebOS.
-actionShowToastInputIconLabel=Icône
-actionShowToastInputIconDesc=L'URL de l'icône à afficher
-
-actionLaunchBrowserLabel=lancer le navigateur
-actionLaunchBrowserDesc=Ouvre l'URL donnée dans l'application navigateur du téléviseur.
-actionLaunchBrowserInputUrlLabel=URL
-actionLaunchBrowserInputUrlDesc=L'URL à ouvrir
 
+actionDecreaseChannelLabel = passer à la chaîne précédente
+actionDecreaseChannelDesc = Le téléviseur basculera sur la chaîne précédente de la liste actuelle des chaînes.
+actionIncreaseChannelLabel = passer à la chaîne suivante
+actionIncreaseChannelDesc = Le téléviseur basculera sur la chaîne suivante de la liste actuelle des chaînes.
 actionLaunchApplicationLabel = lancer une application
 actionLaunchApplicationDesc = Ouvre l'application avec l'identifiant d'application donné.
 actionLaunchApplicationInputAppIDLabel = ID d'application
 actionLaunchApplicationInputAppIDDesc = L'identifiant de l'application
-
 actionLaunchApplicationWithParamsLabel = lancer une application avec des paramètres
 actionLaunchApplicationWithParamsDesc = Ouvre l'application avec l'identifiant d'application donné et passe des paramètres supplémentaires.
 actionLaunchApplicationInputParamsLabel = Paramètres JSON
 actionLaunchApplicationInputParamsDesc = Les paramètres à transmettre à l'application au format JSON
-
+actionLaunchBrowserLabel = lancer le navigateur
-actionSendTextLabel=envoyer une saisie de texte
+actionLaunchBrowserDesc = Ouvre l'URL donnée dans l'application navigateur du téléviseur.
-actionSendTextDesc=Envoie une saisie de texte à un appareil WebOS.
+actionLaunchBrowserInputUrlLabel = URL
-actionSendTextInputTextLabel=Texte
+actionLaunchBrowserInputUrlDesc = L'URL à ouvrir
-actionSendTextInputTextDesc=Le texte à saisir
-
 actionSendButtonLabel = envoyer un appui de bouton
 actionSendButtonDesc = Envoie un événement d'appui de bouton à un appareil WebOS.
 actionSendButtonInputButtonLabel = Bouton
 actionSendButtonInputButtonDesc = Peut être UP, DOWN, LEFT, RIGHT, BACK, DELETE, ENTER, HOME ou OK
-
-actionIncreaseChannelLabel=passer à la chaîne suivante
-actionIncreaseChannelDesc=Le téléviseur basculera sur la chaîne suivante de la liste actuelle des chaînes.
-
-actionDecreaseChannelLabel=passer à la chaîne précédente
-actionDecreaseChannelDesc=Le téléviseur basculera sur la chaîne précédente de la liste actuelle des chaînes.
-
 actionSendRCButtonLabel = simuler l'appui sur un bouton de la télécommande
 actionSendRCButtonDesc = Simule l'appui sur un bouton de la télécommande.
 actionSendRCButtonInputTextLabel = Nom du bouton de la télécommande
 actionSendRCButtonInputTextDesc = Le nom du bouton de la télécommande à envoyer à un appareil WebOS.
+actionSendTextLabel = envoyer une saisie de texte
+actionSendTextDesc = Envoie une saisie de texte à un appareil WebOS.
+actionSendTextInputTextLabel = Texte
+actionSendTextInputTextDesc = Le texte à saisir
+actionShowToastLabel = affiche un message à l'écran
+actionShowToastDesc = Envoie un message à afficher avec l'icône openHAB à un appareil WebOS.
+actionShowToastInputTextLabel = Texte
+actionShowToastInputTextDesc = Le texte à afficher
+actionShowToastWithIconDesc = Envoie un message à afficher avec une icône personnalisée à un appareil WebOS.
+actionShowToastInputIconLabel = Icône
+actionShowToastInputIconDesc = L'URL de l'icône à afficher

bundles/org.openhab.binding.lgwebos/src/main/resources/OH-INF/i18n/lgwebos_hu.properties

@@ -1,44 +1,37 @@
-actionShowToastLabel=tippek mutatása
+# thing actions
-actionShowToastDesc=Tippek üzenet küldése a WebOS eszközre openHAB ikonnal.
-actionShowToastInputTextLabel=Szöveg
-actionShowToastInputTextDesc=Megjelenítendő szöveg
-
-actionShowToastWithIconLabel=Tippek üzenet küldése a WebOS eszközre egyéni ikonnal.
-actionShowToastInputIconLabel=Ikon
-actionShowToastInputIconDesc=A megjelenítendő ikon URL címe
-
-actionLaunchBrowserLabel=böngésző indítása
-actionLaunchBrowserDesc=A megadott URL megnyitása a TV böngésző alkalmazásában.
-actionLaunchBrowserInputUrlLabel=URL
-actionLaunchBrowserInputUrlDesc=A megnyitandó webcím
 
+actionDecreaseChannelLabel = egy csatornával lejjebb
+actionDecreaseChannelDesc = A TV egy csatornával lejjebb lép az aktuális csatorna listán.
+actionIncreaseChannelLabel = egy csatornával feljebb
+actionIncreaseChannelDesc = A TV egy csatornával feljebb lép az aktuális csatorna listán.
 actionLaunchApplicationLabel = alkalmazás indítása
 actionLaunchApplicationDesc = Alkalmazás megnyitása a megadott alkalmazás azonosítóval.
 actionLaunchApplicationInputAppIDLabel = Alkalmazás azonosító
 actionLaunchApplicationInputAppIDDesc = Alkalmazás azonosító
-
 actionLaunchApplicationWithParamsLabel = alkalmazás elindítása a megadott paraméterekkel
 actionLaunchApplicationWithParamsDesc = Az alkalmazás elindítása a megadott azonosítóval és paraméterekkel.
 actionLaunchApplicationInputParamsLabel = JSON paraméterek
 actionLaunchApplicationInputParamsDesc = Az alkalmazás számára átadandó paraméterek JSON formátumban
-
+actionLaunchBrowserLabel = böngésző indítása
-actionSendTextLabel=szöveg bevitel küldése
+actionLaunchBrowserDesc = A megadott URL megnyitása a TV böngésző alkalmazásában.
-actionSendTextDesc=Szöveg bevitel küldése a WebOS eszközre.
+actionLaunchBrowserInputUrlLabel = URL
-actionSendTextInputTextLabel=Szöveg
+actionLaunchBrowserInputUrlDesc = A megnyitandó webcím
-actionSendTextInputTextDesc=Szövegbevitel
-
 actionSendButtonLabel = gombnyomás küldése
 actionSendButtonDesc = Gombnyomás esemény küldése a WebOS eszközre.
 actionSendButtonInputButtonLabel = Gomb
 actionSendButtonInputButtonDesc = Egy a következőkből\: FEL, LE, BAL, JOBB, VISSZA, TÖRLÉS, ENTER, HAZA vagy OK
-
-actionIncreaseChannelLabel=egy csatornával feljebb
-actionIncreaseChannelDesc=A TV egy csatornával feljebb lép az aktuális csatorna listán.
-
-actionDecreaseChannelLabel=egy csatornával lejjebb
-actionDecreaseChannelDesc=A TV egy csatornával lejjebb lép az aktuális csatorna listán.
-
 actionSendRCButtonLabel = távirányító gombnyomás szimulálása
 actionSendRCButtonDesc = Távirányító gomb megnyomásának szimulálása.
 actionSendRCButtonInputTextLabel = Távirányító gomb neve
 actionSendRCButtonInputTextDesc = A távirányító gomb neve, amit a WebOS eszköznek küldünk.
+actionSendTextLabel = szöveg bevitel küldése
+actionSendTextDesc = Szöveg bevitel küldése a WebOS eszközre.
+actionSendTextInputTextLabel = Szöveg
+actionSendTextInputTextDesc = Szövegbevitel
+actionShowToastLabel = tippek mutatása
+actionShowToastDesc = Tippek üzenet küldése a WebOS eszközre openHAB ikonnal.
+actionShowToastInputTextLabel = Szöveg
+actionShowToastInputTextDesc = Megjelenítendő szöveg
+actionShowToastWithIconDesc = Tippek üzenet küldése a WebOS eszközre egyéni ikonnal.
+actionShowToastInputIconLabel = Ikon
+actionShowToastInputIconDesc = A megjelenítendő ikon URL címe