From 266feb8a878dfc46810e20f67193cc5d6ca4f225 Mon Sep 17 00:00:00 2001
From: lolodomo <lg.hc@free.fr>
Date: Mon, 6 Jun 2022 13:17:22 +0200
Subject: [PATCH] [sncf] Align XML description and default translations
 (#12887)

Re-run of the i18n tool will then trigger no change.

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
---
 .../main/resources/OH-INF/config/config.xml   |  1 +
 .../resources/OH-INF/i18n/sncf.properties     | 25 +++++++++++++------
 .../main/resources/OH-INF/thing/bridge.xml    |  1 +
 .../main/resources/OH-INF/thing/station.xml   | 11 +++++++-
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/config/config.xml b/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/config/config.xml
index d96cf36e3..72da1466f 100644
--- a/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/config/config.xml
+++ b/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/config/config.xml
@@ -8,6 +8,7 @@
 	<config-description uri="thing-type:sncf:api">
 		<parameter name="apiID" type="text" required="true">
 			<label>API ID</label>
+			<description>Your SNCF API ID</description>
 			<context>password</context>
 		</parameter>
 	</config-description>
diff --git a/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/i18n/sncf.properties b/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/i18n/sncf.properties
index 1b02bcf82..0039650ed 100644
--- a/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/i18n/sncf.properties
+++ b/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/i18n/sncf.properties
@@ -1,23 +1,32 @@
+# binding
 
 binding.sncf.name = SNCF Binding
 binding.sncf.description = Retrieves French railway informations
 
-config.thing-type.sncf.api.apiID.label = API ID
-config.thing-type.sncf.api.apiID.description = Your SNCF API ID
+# thing types
 
 thing-type.sncf.api.label = SNCF API
 thing-type.sncf.api.description = This bridge is the gateway to SNCF API.
-
 thing-type.sncf.station.label = Station
 thing-type.sncf.station.description = Represents a station hosting some transportation mode.
 thing-type.sncf.station.group.arrivals.label = Next Arrival
-thing-type.sncf.station.group.arrivals.description = Informations regarding next arrival at the station.
+thing-type.sncf.station.group.arrivals.description = Information regarding the next arrival at the station.
 thing-type.sncf.station.group.departures.label = Next Departure
-thing-type.sncf.station.group.departures.description = Informations regarding next departure from the station.
+thing-type.sncf.station.group.departures.description = Information regarding the next departure from the station.
 
+# thing types config
+
+thing-type.config.sncf.api.apiID.label = API ID
+thing-type.config.sncf.api.apiID.description = Your SNCF API ID
 thing-type.config.sncf.station.stopPointId.label = Stop Point ID
 thing-type.config.sncf.station.stopPointId.description = The stop point ID of the station as defined by DIGITALSNCF.
-  
+
+# channel group types
+
+channel-group-type.sncf.passage.label = Other
+
+# channel types
+
 channel-type.sncf.direction.label = Direction
 channel-type.sncf.direction.description = The direction of this route.
 channel-type.sncf.lineName.label = Line
@@ -28,8 +37,10 @@ channel-type.sncf.network.label = Network
 channel-type.sncf.network.description = Name of the transportation network.
 channel-type.sncf.timestamp.label = Timestamp
 channel-type.sncf.timestamp.description = Timestamp of the future event.
+channel-type.sncf.timestamp.state.pattern = %1$tH:%1$tM:%1$tS
+
+# error messages
 
-# Error messages
 null-or-empty-api-key = Null or empty API ID
 error-invalid-apikey = Invalid API ID
 null-or-empty-station-id = Null or empty Station ID
diff --git a/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/thing/bridge.xml b/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/thing/bridge.xml
index ab99f53c2..8694a956b 100644
--- a/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/thing/bridge.xml
+++ b/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/thing/bridge.xml
@@ -6,6 +6,7 @@
 
 	<bridge-type id="api">
 		<label>SNCF API</label>
+		<description>This bridge is the gateway to SNCF API.</description>
 		<config-description-ref uri="thing-type:sncf:api"/>
 	</bridge-type>
 
diff --git a/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/thing/station.xml b/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/thing/station.xml
index 495b8c1bf..4cb6574d0 100644
--- a/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/thing/station.xml
+++ b/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/thing/station.xml
@@ -10,13 +10,16 @@
 		</supported-bridge-type-refs>
 
 		<label>Station</label>
+		<description>Represents a station hosting some transportation mode.</description>
 
 		<channel-groups>
 			<channel-group id="arrivals" typeId="passage">
 				<label>Next Arrival</label>
+				<description>Information regarding the next arrival at the station.</description>
 			</channel-group>
 			<channel-group id="departures" typeId="passage">
 				<label>Next Departure</label>
+				<description>Information regarding the next departure from the station.</description>
 			</channel-group>
 		</channel-groups>
 
@@ -24,7 +27,8 @@
 
 		<config-description>
 			<parameter name="stopPointId" type="text" required="true">
-				<label>Station ID</label>
+				<label>Stop Point ID</label>
+				<description>The stop point ID of the station as defined by DIGITALSNCF.</description>
 			</parameter>
 		</config-description>
 	</thing-type>
@@ -43,30 +47,35 @@
 	<channel-type id="direction">
 		<item-type>String</item-type>
 		<label>Direction</label>
+		<description>The direction of this route.</description>
 		<state readOnly="true"></state>
 	</channel-type>
 
 	<channel-type id="lineName">
 		<item-type>String</item-type>
 		<label>Line</label>
+		<description>Name of the line (network + line number/letter)</description>
 		<state readOnly="true"></state>
 	</channel-type>
 
 	<channel-type id="name" advanced="true">
 		<item-type>String</item-type>
 		<label>Name</label>
+		<description>Name of the line.</description>
 		<state readOnly="true"></state>
 	</channel-type>
 
 	<channel-type id="network" advanced="true">
 		<item-type>String</item-type>
 		<label>Network</label>
+		<description>Name of the transportation network.</description>
 		<state readOnly="true"></state>
 	</channel-type>
 
 	<channel-type id="timestamp">
 		<item-type>DateTime</item-type>
 		<label>Timestamp</label>
+		<description>Timestamp of the future event.</description>
 		<category>time</category>
 		<state readOnly="true" pattern="%1$tH:%1$tM:%1$tS"/>
 	</channel-type>