[hue] Factorize thing configurations (#11535)

* Reduce the number of strings to translate
* Remove wrong key for channel pattern

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

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/config/config.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/config/config.xml
index 71e34113f650c2791c16dc413a0dde9a422a9bb6..bddda1e9b05e2cabd8c7f0a4f2cb79e913f5d662 100644 (file)
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/config/config.xml
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/config/config.xml
@@ -4,15 +4,56 @@
        xmlns:config-description="https://openhab.org/schemas/config-description/v1.0.0"
        xsi:schemaLocation="https://openhab.org/schemas/config-description/v1.0.0 https://openhab.org/schemas/config-description-1.0.0.xsd">
 
+       <config-description uri="thing-type:hue:lightlevelsensor">
+               <parameter name="sensorId" type="text" required="true">
+                       <label>@text/config.sensorId.label</label>
+                       <description>@text/config.sensorId.description</description>
+               </parameter>
+               <parameter name="on" type="boolean">
+                       <label>@text/config.on.label</label>
+                       <description>@text/config.on.description</description>
+               </parameter>
+               <parameter name="ledindication" type="boolean">
+                       <label>@text/config.ledindication.label</label>
+                       <description>@text/config.ledindication.description</description>
+               </parameter>
+               <parameter name="tholddark" type="integer" min="0" step="1">
+                       <label>Threshold Dark</label>
+                       <description>Threshold the user configured to be used in rules to determine insufficient light level (ie below
+                               threshold). Default value 16000.</description>
+                       <default>16000</default>
+               </parameter>
+               <parameter name="tholdoffset" type="integer" min="1" step="1">
+                       <label>Threshold Offset</label>
+                       <description>Threshold the user configured to be used in rules to determine sufficient light level (ie above
+                               threshold). Specified as relative offset to the "dark" threshold. Shall be >=1. Default value 7000.</description>
+                       <default>7000</default>
+               </parameter>
+       </config-description>
+
+       <config-description uri="thing-type:hue:temperaturesensor">
+               <parameter name="sensorId" type="text" required="true">
+                       <label>@text/config.sensorId.label</label>
+                       <description>@text/config.sensorId.description</description>
+               </parameter>
+               <parameter name="on" type="boolean">
+                       <label>@text/config.on.label</label>
+                       <description>@text/config.on.description</description>
+               </parameter>
+               <parameter name="ledindication" type="boolean">
+                       <label>@text/config.ledindication.label</label>
+                       <description>@text/config.ledindication.description</description>
+               </parameter>
+       </config-description>
+
        <config-description uri="thing-type:hue:presencesensor">
                <parameter name="sensorId" type="text" required="true">
-                       <label>Sensor ID</label>
-                       <description>The identifier that is used within the hue bridge.</description>
+                       <label>@text/config.sensorId.label</label>
+                       <description>@text/config.sensorId.description</description>
                </parameter>
                <parameter name="ledindication" type="boolean">
-                       <label>LED Indication</label>
-                       <description>Turns device LED during normal operation on or off. Devices might still indicate exceptional operation
-                               (Reset, SW Update, Battery Low).</description>
+                       <label>@text/config.ledindication.label</label>
+                       <description>@text/config.ledindication.description</description>
                </parameter>
                <parameter name="sensitivity" type="integer" min="0" step="1">
                        <label>Sensitivity</label>
@@ -24,14 +65,64 @@
                </parameter>
        </config-description>
 
-       <config-description uri="thing-type:hue:geofencesensor">
+       <config-description uri="thing-type:hue:sensor">
                <parameter name="sensorId" type="text" required="true">
-                       <label>Sensor ID</label>
-                       <description>The identifier that is used within the hue bridge.</description>
+                       <label>@text/config.sensorId.label</label>
+                       <description>@text/config.sensorId.description</description>
                </parameter>
                <parameter name="on" type="boolean">
-                       <label>Sensor Status</label>
-                       <description>Enables or disables the sensor.</description>
+                       <label>@text/config.on.label</label>
+                       <description>@text/config.on.description</description>
+               </parameter>
+       </config-description>
+
+       <config-description uri="thing-type:hue:light">
+               <parameter name="lightId" type="text" required="true">
+                       <label>@text/config.lightId.label</label>
+                       <description>@text/config.lightId.description</description>
+               </parameter>
+               <parameter name="fadetime" type="integer" min="0" step="100" unit="ms">
+                       <label>@text/config.fadetime.label</label>
+                       <description>@text/config.fadetime.description</description>
+                       <default>400</default>
+               </parameter>
+       </config-description>
+
+       <config-description uri="thing-type:hue:lightwithoutfade">
+               <parameter name="lightId" type="text" required="true">
+                       <label>@text/config.lightId.label</label>
+                       <description>@text/config.lightId.description</description>
+               </parameter>
+       </config-description>
+
+       <config-description uri="thing-type:hue:plug">
+               <parameter name="lightId" type="text" required="true">
+                       <label>@text/config.plugId.label</label>
+                       <description>@text/config.plugId.description</description>
+               </parameter>
+               <parameter name="fadetime" type="integer" min="0" step="100" unit="ms">
+                       <label>@text/config.fadetime.label</label>
+                       <description>@text/config.fadetime.description</description>
+                       <default>400</default>
+               </parameter>
+       </config-description>
+
+       <config-description uri="thing-type:hue:plugwithoutfade">
+               <parameter name="lightId" type="text" required="true">
+                       <label>@text/config.plugId.label</label>
+                       <description>@text/config.plugId.description</description>
+               </parameter>
+       </config-description>
+
+       <config-description uri="thing-type:hue:group">
+               <parameter name="groupId" type="text" required="true">
+                       <label>Group ID</label>
+                       <description>The group identifier identifies one certain hue group or room.</description>
+               </parameter>
+               <parameter name="fadetime" type="integer" min="0" step="100" unit="ms">
+                       <label>@text/config.fadetime.label</label>
+                       <description>@text/config.fadetime.description</description>
+                       <default>400</default>
                </parameter>
        </config-description>
 

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue.properties b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue.properties
index fa842293b431778a3d1fa2f508f3f7283ad0f11b..49e40b30088539a6c52b1f099e82a8386760bb75 100644 (file)
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue.properties
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue.properties
@@ -47,62 +47,6 @@ thing-type.hue.group.description = A group of lights or a room that could be swi
 
 # thing types config
 
-thing-type.config.hue.0000.lightId.label = Light ID
-thing-type.config.hue.0000.lightId.description = The light identifier identifies one certain hue light.
-thing-type.config.hue.0010.lightId.label = Light ID
-thing-type.config.hue.0010.lightId.description = The identifier that is used within the hue bridge.
-thing-type.config.hue.0100.fadetime.label = Fade Time
-thing-type.config.hue.0100.fadetime.description = Fade time in milliseconds for changing values
-thing-type.config.hue.0100.lightId.label = Light ID
-thing-type.config.hue.0100.lightId.description = The light identifier identifies one certain hue light.
-thing-type.config.hue.0106.ledindication.label = LED Indication
-thing-type.config.hue.0106.ledindication.description = Turns device LED during normal operation on or off. Devices might still indicate exceptional operation (Reset, SW Update, Battery Low).
-thing-type.config.hue.0106.on.label = Sensor Status
-thing-type.config.hue.0106.on.description = Enables or disables the sensor.
-thing-type.config.hue.0106.sensorId.label = Sensor ID
-thing-type.config.hue.0106.sensorId.description = The identifier that is used within the hue bridge.
-thing-type.config.hue.0106.tholddark.label = Threshold Dark
-thing-type.config.hue.0106.tholddark.description = Threshold the user configured to be used in rules to determine insufficient light level (ie below threshold). Default value 16000.
-thing-type.config.hue.0106.tholdoffset.label = Threshold Offset
-thing-type.config.hue.0106.tholdoffset.description = Threshold the user configured to be used in rules to determine sufficient light level (ie above threshold). Specified as relative offset to the "dark" threshold. Shall be >=1. Default value 7000.
-thing-type.config.hue.0110.fadetime.label = Fade Time
-thing-type.config.hue.0110.fadetime.description = Fade time in milliseconds for changing values
-thing-type.config.hue.0110.lightId.label = Light ID
-thing-type.config.hue.0110.lightId.description = The identifier that is used within the hue bridge.
-thing-type.config.hue.0200.fadetime.label = Fade Time
-thing-type.config.hue.0200.fadetime.description = Fade time in milliseconds for changing values
-thing-type.config.hue.0200.lightId.label = Light ID
-thing-type.config.hue.0200.lightId.description = The light identifier identifies one certain hue light.
-thing-type.config.hue.0210.fadetime.label = Fade Time
-thing-type.config.hue.0210.fadetime.description = Fade time in milliseconds for changing values
-thing-type.config.hue.0210.lightId.label = Light ID
-thing-type.config.hue.0210.lightId.description = The light identifier identifies one certain hue light.
-thing-type.config.hue.0220.fadetime.label = Fade Time
-thing-type.config.hue.0220.fadetime.description = Fade time in milliseconds for changing values
-thing-type.config.hue.0220.lightId.label = Light ID
-thing-type.config.hue.0220.lightId.description = The light identifier identifies one certain hue light.
-thing-type.config.hue.0302.ledindication.label = LED Indication
-thing-type.config.hue.0302.ledindication.description = Turns device LED during normal operation on or off. Devices might still indicate exceptional operation (Reset, SW Update, Battery Low).
-thing-type.config.hue.0302.on.label = Sensor Status
-thing-type.config.hue.0302.on.description = Enables or disables the sensor.
-thing-type.config.hue.0302.sensorId.label = Sensor ID
-thing-type.config.hue.0302.sensorId.description = The identifier that is used within the hue bridge.
-thing-type.config.hue.0820.on.label = Sensor Status
-thing-type.config.hue.0820.on.description = Enables or disables the sensor.
-thing-type.config.hue.0820.sensorId.label = Sensor ID
-thing-type.config.hue.0820.sensorId.description = The identifier that is used within the hue bridge.
-thing-type.config.hue.0830.on.label = Sensor Status
-thing-type.config.hue.0830.on.description = Enables or disables the sensor.
-thing-type.config.hue.0830.sensorId.label = Sensor ID
-thing-type.config.hue.0830.sensorId.description = The identifier that is used within the hue bridge.
-thing-type.config.hue.0840.on.label = Sensor Status
-thing-type.config.hue.0840.on.description = Enables or disables the sensor.
-thing-type.config.hue.0840.sensorId.label = Sensor ID
-thing-type.config.hue.0840.sensorId.description = The identifier that is used within the hue bridge.
-thing-type.config.hue.0850.on.label = Sensor Status
-thing-type.config.hue.0850.on.description = Enables or disables the sensor.
-thing-type.config.hue.0850.sensorId.label = Sensor ID
-thing-type.config.hue.0850.sensorId.description = The identifier that is used within the hue bridge.
 thing-type.config.hue.bridge.ipAddress.label = Network Address
 thing-type.config.hue.bridge.ipAddress.description = Network address of the Hue bridge.
 thing-type.config.hue.bridge.pollingInterval.label = Polling Interval
@@ -113,22 +57,16 @@ thing-type.config.hue.bridge.sensorPollingInterval.label = Sensor Polling Interv
 thing-type.config.hue.bridge.sensorPollingInterval.description = Milliseconds between fetching sensor-values from the Hue bridge. A higher value means more delay for the sensor values, but a too low value can cause congestion on the Hue bridge. Use 0 to disable the polling for sensors. Default is 500.
 thing-type.config.hue.bridge.userName.label = Username
 thing-type.config.hue.bridge.userName.description = Name of a registered Hue bridge user, that allows to access the API.
-thing-type.config.hue.geofencesensor.on.label = Sensor Status
-thing-type.config.hue.geofencesensor.on.description = Enables or disables the sensor.
-thing-type.config.hue.geofencesensor.sensorId.label = Sensor ID
-thing-type.config.hue.geofencesensor.sensorId.description = The identifier that is used within the hue bridge.
-thing-type.config.hue.group.fadetime.label = Fade Time
-thing-type.config.hue.group.fadetime.description = Fade time in milliseconds for changing values
 thing-type.config.hue.group.groupId.label = Group ID
 thing-type.config.hue.group.groupId.description = The group identifier identifies one certain hue group or room.
-thing-type.config.hue.presencesensor.ledindication.label = LED Indication
-thing-type.config.hue.presencesensor.ledindication.description = Turns device LED during normal operation on or off. Devices might still indicate exceptional operation (Reset, SW Update, Battery Low).
+thing-type.config.hue.lightlevelsensor.tholddark.label = Threshold Dark
+thing-type.config.hue.lightlevelsensor.tholddark.description = Threshold the user configured to be used in rules to determine insufficient light level (ie below threshold). Default value 16000.
+thing-type.config.hue.lightlevelsensor.tholdoffset.label = Threshold Offset
+thing-type.config.hue.lightlevelsensor.tholdoffset.description = Threshold the user configured to be used in rules to determine sufficient light level (ie above threshold). Specified as relative offset to the "dark" threshold. Shall be >=1. Default value 7000.
 thing-type.config.hue.presencesensor.sensitivity.label = Sensitivity
 thing-type.config.hue.presencesensor.sensitivity.description = The current sensitivity of the presence sensor. Cannot exceed maximum sensitivity.
 thing-type.config.hue.presencesensor.sensitivitymax.label = Maximum Sensitivity
 thing-type.config.hue.presencesensor.sensitivitymax.description = The maximum sensitivity of the presence sensor.
-thing-type.config.hue.presencesensor.sensorId.label = Sensor ID
-thing-type.config.hue.presencesensor.sensorId.description = The identifier that is used within the hue bridge.
 
 # channel types
 
@@ -187,9 +125,20 @@ channel-type.hue.tap_switch_event.description = Triggers when a button is presse
 channel-type.hue.temperature.label = Temperature
 channel-type.hue.temperature.description = Current temperature.
 
-# channel types
+# thing types config
 
-channel-type.hue.last_updated.options.pattern = %1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS
+config.fadetime.label = Fade Time
+config.fadetime.description = Fade time in milliseconds for changing values.
+config.ledindication.label = LED Indication
+config.ledindication.description = Turns device LED during normal operation on or off. Devices might still indicate exceptional operation (Reset, SW Update, Battery Low).
+config.lightId.label = Light ID
+config.lightId.description = The light identifier that is used within the hue bridge.
+config.plugId.label = Plug ID
+config.plugId.description = The plug identifier that is used within the hue bridge.
+config.sensorId.label = Sensor ID
+config.sensorId.description = The sensor identifier that is used within the hue bridge.
+config.on.label = Sensor Status
+config.on.description = Enables or disables the sensor.
 
 # config status messages
 

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue_de.properties b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue_de.properties
index 7fdcfabf4abff42615e139595cb111084cf3f861..5506a2a46ddd9bd7d4d1d16860852c66ef871196 100644 (file)
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue_de.properties
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue_de.properties
@@ -47,62 +47,6 @@ thing-type.hue.group.description = Eine Gruppe von Lichtern, ein Raum oder eine
 
 # thing types config
 
-thing-type.config.hue.0000.lightId.label = ID der Lampe
-thing-type.config.hue.0000.lightId.description = ID zur Identifikation der Lampe.
-thing-type.config.hue.0010.lightId.label = ID der Steckdose
-thing-type.config.hue.0010.lightId.description = ID zur Identifikation der Steckdose.
-thing-type.config.hue.0100.fadetime.label = Dauer des Überblendens
-thing-type.config.hue.0100.fadetime.description = Dauer des Überblendens bei Änderung von Werten (in Millisekunden).
-thing-type.config.hue.0100.lightId.label = ID der Lampe
-thing-type.config.hue.0100.lightId.description = ID zur Identifikation der Lampe.
-thing-type.config.hue.0106.ledindication.label = LED-Anzeige
-thing-type.config.hue.0106.ledindication.description = Aktiviert oder deaktiviert die LED-Anzeige des Sensors.
-thing-type.config.hue.0106.on.label = Sensor Status
-thing-type.config.hue.0106.on.description = Aktiviert oder deaktiviert den Sensor.
-thing-type.config.hue.0106.sensorId.label = ID des Sensors
-thing-type.config.hue.0106.sensorId.description = ID zur Identifikation des Sensors.
-thing-type.config.hue.0106.tholddark.label = Dunkel-Schwellwert
-thing-type.config.hue.0106.tholddark.description = Zeigt den Dunkel-Schwellwert an.
-thing-type.config.hue.0106.tholdoffset.label = Hell-Schwellwert
-thing-type.config.hue.0106.tholdoffset.description = Zeigt den Hell-Schwellwert an.
-thing-type.config.hue.0110.fadetime.label = Dauer des Überblendens
-thing-type.config.hue.0110.fadetime.description = Dauer des Überblendens bei Änderung von Werten (in Millisekunden).
-thing-type.config.hue.0110.lightId.label = ID der Steckdose
-thing-type.config.hue.0110.lightId.description = ID zur Identifikation der Steckdose.
-thing-type.config.hue.0200.fadetime.label = Dauer des Überblendens
-thing-type.config.hue.0200.fadetime.description = Dauer des Überblendens bei Änderung von Werten (in Millisekunden).
-thing-type.config.hue.0200.lightId.label = ID der Lampe
-thing-type.config.hue.0200.lightId.description = ID zur Identifikation der Lampe.
-thing-type.config.hue.0210.fadetime.label = Dauer des Überblendens
-thing-type.config.hue.0210.fadetime.description = Dauer des Überblendens bei Änderung von Werten (in Millisekunden).
-thing-type.config.hue.0210.lightId.label = ID der Lampe
-thing-type.config.hue.0210.lightId.description = ID zur Identifikation der Lampe.
-thing-type.config.hue.0220.fadetime.label = Dauer des Überblendens
-thing-type.config.hue.0220.fadetime.description = Dauer des Überblendens bei Änderung von Werten (in Millisekunden).
-thing-type.config.hue.0220.lightId.label = ID der Lampe
-thing-type.config.hue.0220.lightId.description = ID zur Identifikation der Lampe.
-thing-type.config.hue.0302.ledindication.label = LED-Anzeige
-thing-type.config.hue.0302.ledindication.description = Aktiviert oder deaktiviert die LED-Anzeige des Sensors.
-thing-type.config.hue.0302.on.label = Sensor Status
-thing-type.config.hue.0302.on.description = Aktiviert oder deaktiviert den Sensor.
-thing-type.config.hue.0302.sensorId.label = ID des Sensors
-thing-type.config.hue.0302.sensorId.description = ID zur Identifikation des Sensors.
-thing-type.config.hue.0820.on.label = Sensor Status
-thing-type.config.hue.0820.on.description = Aktiviert oder deaktiviert den Sensor.
-thing-type.config.hue.0820.sensorId.label = ID des Sensors
-thing-type.config.hue.0820.sensorId.description = ID zur Identifikation des Sensors.
-thing-type.config.hue.0830.on.label = Sensor Status
-thing-type.config.hue.0830.on.description = Aktiviert oder deaktiviert den Sensor.
-thing-type.config.hue.0830.sensorId.label = ID des Sensors
-thing-type.config.hue.0830.sensorId.description = ID zur Identifikation des Sensors.
-thing-type.config.hue.0840.on.label = Sensor Status
-thing-type.config.hue.0840.on.description = Aktiviert oder deaktiviert den Sensor.
-thing-type.config.hue.0840.sensorId.label = ID des Sensors
-thing-type.config.hue.0840.sensorId.description = ID zur Identifikation des Sensors.
-thing-type.config.hue.0850.on.label = Sensor Status
-thing-type.config.hue.0850.on.description = Aktiviert oder deaktiviert den Sensor.
-thing-type.config.hue.0850.sensorId.label = ID des Sensors
-thing-type.config.hue.0850.sensorId.description = ID zur Identifikation des Sensors.
 thing-type.config.hue.bridge.ipAddress.label = IP-Adresse
 thing-type.config.hue.bridge.ipAddress.description = Lokale IP-Adresse oder Hostname der Hue Bridge.
 thing-type.config.hue.bridge.pollingInterval.label = Abfrageintervall
@@ -113,22 +57,29 @@ thing-type.config.hue.bridge.sensorPollingInterval.label = Sensor-Abfrageinterva
 thing-type.config.hue.bridge.sensorPollingInterval.description = Intervall zur Abfrage der Sensoren der Hue Bridge (in Millisekunden).
 thing-type.config.hue.bridge.userName.label = Benutzer
 thing-type.config.hue.bridge.userName.description = Benutzer zur Authentifizierung an der Hue Bridge.
-thing-type.config.hue.geofencesensor.on.label = Sensor Status
-thing-type.config.hue.geofencesensor.on.description = Aktiviert oder deaktiviert den Sensor.
-thing-type.config.hue.geofencesensor.sensorId.label = ID des Sensors
-thing-type.config.hue.geofencesensor.sensorId.description = ID zur Identifikation des Sensors.
-thing-type.config.hue.group.fadetime.label = Dauer des Überblendens
-thing-type.config.hue.group.fadetime.description = Dauer des Überblendens bei Änderung von Werten (in Millisekunden).
 thing-type.config.hue.group.groupId.label = ID der Gruppe
 thing-type.config.hue.group.groupId.description = ID zur Identifikation der Gruppe.
-thing-type.config.hue.presencesensor.ledindication.label = LED-Anzeige
-thing-type.config.hue.presencesensor.ledindication.description = Aktiviert oder deaktiviert die LED-Anzeige des Sensors.
+thing-type.config.hue.lightlevelsensor.tholddark.label = Dunkel-Schwellwert
+thing-type.config.hue.lightlevelsensor.tholddark.description = Zeigt den Dunkel-Schwellwert an.
+thing-type.config.hue.lightlevelsensor.tholdoffset.label = Hell-Schwellwert
+thing-type.config.hue.lightlevelsensor.tholdoffset.description = Zeigt den Hell-Schwellwert an.
 thing-type.config.hue.presencesensor.sensitivity.label = Empfindlichkeit
 thing-type.config.hue.presencesensor.sensitivity.description = Zeigt die Empfindlichkeit an.
 thing-type.config.hue.presencesensor.sensitivitymax.label = Maximale Empfindlichkeit
 thing-type.config.hue.presencesensor.sensitivitymax.description = Zeigt die maximale Empfindlichkeit an.
-thing-type.config.hue.presencesensor.sensorId.label = ID des Sensors
-thing-type.config.hue.presencesensor.sensorId.description = ID zur Identifikation des Sensors.
+
+config.fadetime.label = Dauer des Überblendens
+config.fadetime.description = Dauer des Überblendens bei Änderung von Werten (in Millisekunden).
+config.ledindication.label = ED-Anzeige
+config.ledindication.description = Aktiviert oder deaktiviert die LED-Anzeige des Sensors.
+config.lightId.label = ID der Lampe
+config.lightId.description = ID zur Identifikation der Lampe.
+config.plugId.label = ID der Steckdose
+config.plugId.description = ID zur Identifikation der Steckdose.
+config.sensorId.label = ID des Sensors
+config.sensorId.description = ID zur Identifikation des Sensors.
+config.on.label = Sensor Status
+config.on.description = Aktiviert oder deaktiviert den Sensor.
 
 # channel types
 
@@ -187,10 +138,6 @@ channel-type.hue.tap_switch_event.description = Wird ausgelöst, wenn auf dem Ta
 channel-type.hue.temperature.label = Temperatur
 channel-type.hue.temperature.description = Die aktuelle Temperatur.
 
-# channel types
-
-channel-type.hue.last_updated.options.pattern = %1$td.%1$tm.%1$tY %1$tH\:%1$tM\:%1$tS
-
 # config status messages
 
 config-status.error.missing-ip-address-configuration = Es wurde keine IP-Adresse für die Hue Bridge angegeben.

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue_fr.properties b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue_fr.properties
index 3b35df70aa0d12f0a772a2116f928b33e0e27949..87e642f24e8d5126e358c4c6bf0b9449bcb96782 100644 (file)
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue_fr.properties
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue_fr.properties
@@ -1,10 +1,10 @@
 # binding
+
 binding.hue.name = Extension hue
 binding.hue.description = L'extension hue intègre le système Philips hue et permet de contrôler des ampoules hue.
 
 # thing types
-thing-type.hue.bridge.label = Pont de connexion hue
-thing-type.hue.bridge.description = Le pont de connexion Philips Hue.
+
 thing-type.hue.0000.label = Ampoule sans variation
 thing-type.hue.0000.description = Une ampoule sans réglage de l'intensité lumineuse.
 thing-type.hue.0010.label = Prise commandée sans variation
@@ -19,34 +19,33 @@ thing-type.hue.0210.label = Ampoule couleur
 thing-type.hue.0210.description = Une ampoule avec réglages de l'intensité lumineuse, de la couleur et de la température de couleur
 thing-type.hue.0220.label = Ampoule couleur
 thing-type.hue.0220.description = Une ampoule avec réglages de l'intensité lumineuse et de la température de couleur.
+thing-type.hue.bridge.label = Pont de connexion hue
+thing-type.hue.bridge.description = Le pont de connexion Philips Hue.
 thing-type.hue.group.label = Groupe hue
 thing-type.hue.group.description = Un groupe d'ampoules ou une pièce pouvant être allumé et éteint.
 
 # thing type configuration
+
 thing-type.config.hue.bridge.ipAddress.label = Adresse réseau
 thing-type.config.hue.bridge.ipAddress.description = L'adresse réseau du pont de connexion hue.
-thing-type.config.hue.bridge.userName.label = Nom d'utilisateur
-thing-type.config.hue.bridge.userName.description = Le nom d'un utilisateur enregistré sur le pont de connexion hue, autorisant un accès à l'API.
 thing-type.config.hue.bridge.pollingInterval.label = Intervalle d'interrogation
 thing-type.config.hue.bridge.pollingInterval.description = Le nombre de secondes entre chaque récupération des valeurs du pont.
-thing-type.config.hue.0000.lightId.label = ID ampoule
-thing-type.config.hue.0000.lightId.description = L'identifiant d'ampoule identifie l'une des ampoules hue.
-thing-type.config.hue.0010.lightId.label = ID prise commandée
-thing-type.config.hue.0010.lightId.description = L'identifiant de prise commandée identifie l'une des prises commandées. hue
-thing-type.config.hue.0100.lightId.label = ID ampoule
-thing-type.config.hue.0100.lightId.description = L'identifiant d'ampoule identifie l'une des ampoules hue.
-thing-type.config.hue.0110.lightId.label = ID prise commandée
-thing-type.config.hue.0110.lightId.description = L'identifiant de prise commandée identifie l'une des prises commandées. hue.
-thing-type.config.hue.0200.lightId.label = ID ampoule
-thing-type.config.hue.0200.lightId.description = L'identifiant d'ampoule identifie l'une des ampoules hue.
-thing-type.config.hue.0210.lightId.label = ID ampoule
-thing-type.config.hue.0210.lightId.description = L'identifiant d'ampoule identifie l'une des ampoules hue.
-thing-type.config.hue.0220.lightId.label = ID ampoule
-thing-type.config.hue.0220.lightId.description = L'identifiant d'ampoule identifie l'une des ampoules hue.
-thing-type.config.hue.group.groupId.label = ID groupe
+thing-type.config.hue.bridge.userName.label = Nom d'utilisateur
+thing-type.config.hue.bridge.userName.description = Le nom d'un utilisateur enregistré sur le pont de connexion hue, autorisant un accès à l'API.
+thing-type.config.hue.group.groupId.label = ID group
 thing-type.config.hue.group.groupId.description = L'identifiant de groupe identifie l'un des groupes d'ampoules hue ou une pièce.
 
+config.lightId.label = ID ampoule
+config.lightId.description = L'identifiant d'ampoule qui est utilisé dans le pont de connexion Hue.
+config.plugId.label = ID prise commandée
+config.plugId.description = L'identifiant de prise commandée qui est utilisé dans le pont de connexion Hue.
+config.sensorId.label = ID du capteur
+config.sensorId.description = identifiant de capteur qui est utilisé dans le pont de connexion Hue.
+config.on.label = État du capteur
+config.on.description = Active ou désactive le capteur.
+
 # channel types
+
 channel-type.hue.alert.label = Mode alerte
 channel-type.hue.alert.description = Permet un changement temporaire de l'état de l'ampoule.
 channel-type.hue.alert.state.option.NONE = Sans alerte
@@ -55,10 +54,12 @@ channel-type.hue.alert.state.option.LSELECT = Alerte longue
 channel-type.hue.effect.label = Mode boucle de couleur
 channel-type.hue.effect.description = Permet de passer l'ampoule dans un mode boucle de couleur.
 
-# Config status messages
+# config status messages
+
 config-status.error.missing-ip-address-configuration=Aucune adresse IP fournie pour le pont de connexion hue.
 
-# Thing status descriptions
+# thing status descriptions
+
 offline.conf-error-no-ip-address = Echec de la connexion au pont hue. Adresse IP non renseignée dans la configuration.
 offline.conf-error-no-username = Echec de la connexion au pont hue. Nom d''utilisateur pour l''autentification non renseigné dans la configuration.
 offline.conf-error-invalid-username = Echec de l''autentification. Supprimer le nom d''utilisateur de la configuration pour en générer un nouveau.

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/CLIPGenericFlagSensor.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/CLIPGenericFlagSensor.xml
index 262308d69c3061c1fc13b8efcb683875035cd360..c3eeb75f127a7797611a77d5ad0300522f08f0c0 100644 (file)
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/CLIPGenericFlagSensor.xml
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/CLIPGenericFlagSensor.xml
@@ -19,15 +19,6 @@
 
                <representation-property>uniqueId</representation-property>
 
-               <config-description>
-                       <parameter name="sensorId" type="text" required="true">
-                               <label>Sensor ID</label>
-                               <description>The identifier that is used within the hue bridge.</description>
-                       </parameter>
-                       <parameter name="on" type="boolean">
-                               <label>Sensor Status</label>
-                               <description>Enables or disables the sensor.</description>
-                       </parameter>
-               </config-description>
+               <config-description-ref uri="thing-type:hue:sensor"/>
        </thing-type>
 </thing:thing-descriptions>

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/CLIPGenericStatusSensor.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/CLIPGenericStatusSensor.xml
index f683ea0a78defacddcb1f0ff570766daff443338..843cb416c9a894046e078b22e717b9d4789f4318 100644 (file)
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/CLIPGenericStatusSensor.xml
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/CLIPGenericStatusSensor.xml
@@ -19,15 +19,6 @@
 
                <representation-property>uniqueId</representation-property>
 
-               <config-description>
-                       <parameter name="sensorId" type="text" required="true">
-                               <label>Sensor ID</label>
-                               <description>The identifier that is used within the hue bridge.</description>
-                       </parameter>
-                       <parameter name="on" type="boolean">
-                               <label>Sensor Status</label>
-                               <description>Enables or disables the sensor.</description>
-                       </parameter>
-               </config-description>
+               <config-description-ref uri="thing-type:hue:sensor"/>
        </thing-type>
 </thing:thing-descriptions>

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/ColorLight.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/ColorLight.xml
index b76386919b9ab37fddeffc623cb832229d31e052..3102c496266ab8d70cd6a3fe7987388b959067c7 100644 (file)
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/ColorLight.xml
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/ColorLight.xml
@@ -20,16 +20,6 @@
 
                <representation-property>uniqueId</representation-property>
 
-               <config-description>
-                       <parameter name="lightId" type="text" required="true">
-                               <label>Light ID</label>
-                               <description>The light identifier identifies one certain hue light.</description>
-                       </parameter>
-                       <parameter name="fadetime" type="integer" min="0" step="100" unit="ms">
-                               <label>Fade Time</label>
-                               <description>Fade time in milliseconds for changing values</description>
-                               <default>400</default>
-                       </parameter>
-               </config-description>
+               <config-description-ref uri="thing-type:hue:light"/>
        </thing-type>
 </thing:thing-descriptions>

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/ColorTemperatureLight.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/ColorTemperatureLight.xml
index 7bd7ea70f3eb090f71acb6db20006de4631edd7f..6d32d7f46f9071d5c0f4f8ce8879b9d2b7e44038 100644 (file)
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/ColorTemperatureLight.xml
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/ColorTemperatureLight.xml
@@ -22,16 +22,6 @@
 
                <representation-property>uniqueId</representation-property>
 
-               <config-description>
-                       <parameter name="lightId" type="text" required="true">
-                               <label>Light ID</label>
-                               <description>The light identifier identifies one certain hue light.</description>
-                       </parameter>
-                       <parameter name="fadetime" type="integer" min="0" step="100" unit="ms">
-                               <label>Fade Time</label>
-                               <description>Fade time in milliseconds for changing values</description>
-                               <default>400</default>
-                       </parameter>
-               </config-description>
+               <config-description-ref uri="thing-type:hue:light"/>
        </thing-type>
 </thing:thing-descriptions>

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/DimmableLight.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/DimmableLight.xml
index d68de9b6006db6d7d4fa4cf9ca8f65b05459ffa4..62d6b84e74d2f1c0f646ff74c630b286ab6944bd 100644 (file)
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/DimmableLight.xml
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/DimmableLight.xml
@@ -19,16 +19,6 @@
 
                <representation-property>uniqueId</representation-property>
 
-               <config-description>
-                       <parameter name="lightId" type="text" required="true">
-                               <label>Light ID</label>
-                               <description>The light identifier identifies one certain hue light.</description>
-                       </parameter>
-                       <parameter name="fadetime" type="integer" min="0" step="100" unit="ms">
-                               <label>Fade Time</label>
-                               <description>Fade time in milliseconds for changing values</description>
-                               <default>400</default>
-                       </parameter>
-               </config-description>
+               <config-description-ref uri="thing-type:hue:light"/>
        </thing-type>
 </thing:thing-descriptions>

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/DimmablePlug.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/DimmablePlug.xml
index 6a272f9b70c8ece719a149f13332cf35a144872e..0adffeace6f9dbaca2e1bc8496b0d3ade1d76507 100644 (file)
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/DimmablePlug.xml
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/DimmablePlug.xml
@@ -18,16 +18,6 @@
 
                <representation-property>uniqueId</representation-property>
 
-               <config-description>
-                       <parameter name="lightId" type="text" required="true">
-                               <label>Light ID</label>
-                               <description>The identifier that is used within the hue bridge.</description>
-                       </parameter>
-                       <parameter name="fadetime" type="integer" min="0" step="100" unit="ms">
-                               <label>Fade Time</label>
-                               <description>Fade time in milliseconds for changing values</description>
-                               <default>400</default>
-                       </parameter>
-               </config-description>
+               <config-description-ref uri="thing-type:hue:plug"/>
        </thing-type>
 </thing:thing-descriptions>

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/DimmerSwitch.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/DimmerSwitch.xml
index 3fe4e25e301f21678276fd8286dcca7218c5f552..15c9f6735f05fe6b54dd474e5d13af5eccdb6b2e 100644 (file)
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/DimmerSwitch.xml
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/DimmerSwitch.xml
@@ -22,15 +22,6 @@
 
                <representation-property>uniqueId</representation-property>
 
-               <config-description>
-                       <parameter name="sensorId" type="text" required="true">
-                               <label>Sensor ID</label>
-                               <description>The identifier that is used within the hue bridge.</description>
-                       </parameter>
-                       <parameter name="on" type="boolean">
-                               <label>Sensor Status</label>
-                               <description>Enables or disables the sensor.</description>
-                       </parameter>
-               </config-description>
+               <config-description-ref uri="thing-type:hue:sensor"/>
        </thing-type>
 </thing:thing-descriptions>

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/ExtendedColorLight.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/ExtendedColorLight.xml
index 6d64a96ee451e3f2a679d05a0f85834e8645dd80..78c7dacc3f1564891eececd33c1fc08342c86e47 100644 (file)
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/ExtendedColorLight.xml
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/ExtendedColorLight.xml
@@ -22,16 +22,6 @@
 
                <representation-property>uniqueId</representation-property>
 
-               <config-description>
-                       <parameter name="lightId" type="text" required="true">
-                               <label>Light ID</label>
-                               <description>The light identifier identifies one certain hue light.</description>
-                       </parameter>
-                       <parameter name="fadetime" type="integer" min="0" step="100" unit="ms">
-                               <label>Fade Time</label>
-                               <description>Fade time in milliseconds for changing values</description>
-                               <default>400</default>
-                       </parameter>
-               </config-description>
+               <config-description-ref uri="thing-type:hue:light"/>
        </thing-type>
 </thing:thing-descriptions>

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/GeofenceSensor.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/GeofenceSensor.xml
index 02330d79559d3cb4c2415a484f23ee5ddcd36ec0..b9d50f01d64ed01ab47bc81e59d97ed32980c442 100644 (file)
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/GeofenceSensor.xml
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/GeofenceSensor.xml
@@ -19,6 +19,6 @@
 
                <representation-property>uniqueId</representation-property>
 
-               <config-description-ref uri="thing-type:hue:geofencesensor"/>
+               <config-description-ref uri="thing-type:hue:sensor"/>
        </thing-type>
 </thing:thing-descriptions>

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/Group.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/Group.xml
index 3078bd66480f7496a2ff7a0fc3d8837106247edb..76f3a0f1e59c0cc24a3a7b91936f88edfe18f5f9 100644 (file)
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/Group.xml
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/Group.xml
@@ -24,16 +24,6 @@
 
                <representation-property>groupId</representation-property>
 
-               <config-description>
-                       <parameter name="groupId" type="text" required="true">
-                               <label>Group ID</label>
-                               <description>The group identifier identifies one certain hue group or room.</description>
-                       </parameter>
-                       <parameter name="fadetime" type="integer" min="0" step="100" unit="ms">
-                               <label>Fade Time</label>
-                               <description>Fade time in milliseconds for changing values</description>
-                               <default>400</default>
-                       </parameter>
-               </config-description>
+               <config-description-ref uri="thing-type:hue:group"/>
        </thing-type>
 </thing:thing-descriptions>

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/LightLevelSensor.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/LightLevelSensor.xml
index 661d6e9f3c6fc3bb8fc97311ddedb3125c4550b8..278f5efbac676360b221ceb10e6c56bdfd4eceea 100644 (file)
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/LightLevelSensor.xml
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/LightLevelSensor.xml
@@ -24,32 +24,6 @@
 
                <representation-property>uniqueId</representation-property>
 
-               <config-description>
-                       <parameter name="sensorId" type="text" required="true">
-                               <label>Sensor ID</label>
-                               <description>The identifier that is used within the hue bridge.</description>
-                       </parameter>
-                       <parameter name="on" type="boolean">
-                               <label>Sensor Status</label>
-                               <description>Enables or disables the sensor.</description>
-                       </parameter>
-                       <parameter name="ledindication" type="boolean">
-                               <label>LED Indication</label>
-                               <description>Turns device LED during normal operation on or off. Devices might still indicate exceptional operation
-                                       (Reset, SW Update, Battery Low).</description>
-                       </parameter>
-                       <parameter name="tholddark" type="integer" min="0" step="1">
-                               <label>Threshold Dark</label>
-                               <description>Threshold the user configured to be used in rules to determine insufficient light level (ie below
-                                       threshold). Default value 16000.</description>
-                               <default>16000</default>
-                       </parameter>
-                       <parameter name="tholdoffset" type="integer" min="1" step="1">
-                               <label>Threshold Offset</label>
-                               <description>Threshold the user configured to be used in rules to determine sufficient light level (ie above
-                                       threshold). Specified as relative offset to the "dark" threshold. Shall be >=1. Default value 7000.</description>
-                               <default>7000</default>
-                       </parameter>
-               </config-description>
+               <config-description-ref uri="thing-type:hue:lightlevelsensor"/>
        </thing-type>
 </thing:thing-descriptions>

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/OnOffLight.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/OnOffLight.xml
index b2fd1f6259caa15e21291682180489b60e6e9bbe..6f01f226aa35711e119f19576d906dfd61003879 100644 (file)
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/OnOffLight.xml
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/OnOffLight.xml
@@ -19,11 +19,6 @@
 
                <representation-property>uniqueId</representation-property>
 
-               <config-description>
-                       <parameter name="lightId" type="text" required="true">
-                               <label>Light ID</label>
-                               <description>The light identifier identifies one certain hue light.</description>
-                       </parameter>
-               </config-description>
+               <config-description-ref uri="thing-type:hue:lightwithoutfade"/>
        </thing-type>
 </thing:thing-descriptions>

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/OnOffPlug.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/OnOffPlug.xml
index ee1771da33da5364c5bbabe68bb921e5a1f969c1..d109b8fa92be7da56c03f2224bb5a777f515669c 100644 (file)
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/OnOffPlug.xml
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/OnOffPlug.xml
@@ -18,11 +18,6 @@
 
                <representation-property>uniqueId</representation-property>
 
-               <config-description>
-                       <parameter name="lightId" type="text" required="true">
-                               <label>Light ID</label>
-                               <description>The identifier that is used within the hue bridge.</description>
-                       </parameter>
-               </config-description>
+               <config-description-ref uri="thing-type:hue:plugwithoutfade"/>
        </thing-type>
 </thing:thing-descriptions>

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/TapSwitch.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/TapSwitch.xml
index 2f6cce4efa82630d2f06cf625ac436be22889ae1..213f035fd4a6cba915332a4bc7b137a31a676cbe 100644 (file)
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/TapSwitch.xml
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/TapSwitch.xml
@@ -20,15 +20,6 @@
 
                <representation-property>uniqueId</representation-property>
 
-               <config-description>
-                       <parameter name="sensorId" type="text" required="true">
-                               <label>Sensor ID</label>
-                               <description>The identifier that is used within the hue bridge.</description>
-                       </parameter>
-                       <parameter name="on" type="boolean">
-                               <label>Sensor Status</label>
-                               <description>Enables or disables the sensor.</description>
-                       </parameter>
-               </config-description>
+               <config-description-ref uri="thing-type:hue:sensor"/>
        </thing-type>
 </thing:thing-descriptions>

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/TemperatureSensor.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/TemperatureSensor.xml
index 1f68f7fce7f2e6bf476cde2beaf271839c6e655d..c54cd14400cb6888203ca0ce1f1f005d48f41d12 100644 (file)
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/TemperatureSensor.xml
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/TemperatureSensor.xml
@@ -21,20 +21,6 @@
 
                <representation-property>uniqueId</representation-property>
 
-               <config-description>
-                       <parameter name="sensorId" type="text" required="true">
-                               <label>Sensor ID</label>
-                               <description>The identifier that is used within the hue bridge.</description>
-                       </parameter>
-                       <parameter name="on" type="boolean">
-                               <label>Sensor Status</label>
-                               <description>Enables or disables the sensor.</description>
-                       </parameter>
-                       <parameter name="ledindication" type="boolean">
-                               <label>LED Indication</label>
-                               <description>Turns device LED during normal operation on or off. Devices might still indicate exceptional operation
-                                       (Reset, SW Update, Battery Low).</description>
-                       </parameter>
-               </config-description>
+               <config-description-ref uri="thing-type:hue:temperaturesensor"/>
        </thing-type>
 </thing:thing-descriptions>