[ecowatt] Shorter labels for channel options (#13438)

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

diff --git a/bundles/org.openhab.binding.ecowatt/README.md b/bundles/org.openhab.binding.ecowatt/README.md
index 6567b7ca39ce256aa2632b8d47063b818e28e797..9f006b49d9377fb0b6609573497d2cff5c9ab2d0 100644 (file)
--- a/bundles/org.openhab.binding.ecowatt/README.md
+++ b/bundles/org.openhab.binding.ecowatt/README.md
@@ -40,9 +40,9 @@ All channels are read-only.
 
 | Channel           | Type   | Description                                                      |
 |-------------------|--------|------------------------------------------------------------------|
-| todaySignal       | Number | The signal relating to the forecast consumption level for today. Values are 1 for normal consumption, 2 for strained electrical system and 3 for very strained electrical system. |
-| tomorrowSignal    | Number | The signal relating to the forecast consumption level for tomorrow. Values are 1 for normal consumption, 2 for strained electrical system and 3 for very strained electrical system. |
-| currentHourSignal | Number | The signal relating to the forecast consumption level for the current hour. Values are 1 for normal consumption, 2 for strained electrical system and 3 for very strained electrical system. |
+| todaySignal       | Number | The signal relating to the forecast consumption level for today. Values are 1 for normal consumption (green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red). |
+| tomorrowSignal    | Number | The signal relating to the forecast consumption level for tomorrow. Values are 1 for normal consumption (green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red). |
+| currentHourSignal | Number | The signal relating to the forecast consumption level for the current hour. Values are 1 for normal consumption (green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red). |
 
 ## Full Example
 

diff --git a/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt.properties b/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt.properties
index 742223ac7188fb682a74719b4e1a990c260c9bbc..3f5890c865c2ce12bd912e123cd9209a59973ce7 100644 (file)
--- a/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt.properties
+++ b/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt.properties
@@ -8,11 +8,11 @@ binding.ecowatt.description = This binding uses the Ecowatt API to expose clear
 thing-type.ecowatt.signals.label = Electricity Forecast
 thing-type.ecowatt.signals.description = The French electricity consumption forecasts
 thing-type.ecowatt.signals.channel.currentHourSignal.label = Current Hour Signal
-thing-type.ecowatt.signals.channel.currentHourSignal.description = The signal relating to the forecast consumption level for the current hour. Values are 1 for normal consumption, 2 for strained electrical system and 3 for very strained electrical system.
+thing-type.ecowatt.signals.channel.currentHourSignal.description = The signal relating to the forecast consumption level for the current hour. Values are 1 for normal consumption (green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red).
 thing-type.ecowatt.signals.channel.todaySignal.label = Today Signal
-thing-type.ecowatt.signals.channel.todaySignal.description = The signal relating to the forecast consumption level for today. Values are 1 for normal consumption, 2 for strained electrical system and 3 for very strained electrical system.
+thing-type.ecowatt.signals.channel.todaySignal.description = The signal relating to the forecast consumption level for today. Values are 1 for normal consumption (green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red)).
 thing-type.ecowatt.signals.channel.tomorrowSignal.label = Tomorrow Signal
-thing-type.ecowatt.signals.channel.tomorrowSignal.description = The signal relating to the forecast consumption level for tomorrow. Values are 1 for normal consumption, 2 for strained electrical system and 3 for very strained electrical system.
+thing-type.ecowatt.signals.channel.tomorrowSignal.description = The signal relating to the forecast consumption level for tomorrow. Values are 1 for normal consumption (green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red).
 
 # thing types config
 
@@ -24,10 +24,10 @@ thing-type.config.ecowatt.signals.idSecret.description = ID secret provided with
 # channel types
 
 channel-type.ecowatt.signal.label = Consumption Signal
-channel-type.ecowatt.signal.description = The signal relating to the forecast consumption level. Values are 1 for normal consumption, 2 for strained electrical system and 3 for very strained electrical system.
-channel-type.ecowatt.signal.state.option.1 = Green (normal consumption)
-channel-type.ecowatt.signal.state.option.2 = Orange (strained electrical system)
-channel-type.ecowatt.signal.state.option.3 = Red (very strained electrical system)
+channel-type.ecowatt.signal.description = The signal relating to the forecast consumption level. Values are 1 for normal consumption (green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red).
+channel-type.ecowatt.signal.state.option.1 = Green
+channel-type.ecowatt.signal.state.option.2 = Orange
+channel-type.ecowatt.signal.state.option.3 = Red
 
 # thing status descriptions
 

diff --git a/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/thing/thing-types.xml
index 43da2596a628277881b96b3cb6474ea2f7fb125b..5c58aa53b255e8987023972457a4c937629bdb84 100644 (file)
--- a/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/thing/thing-types.xml
@@ -11,18 +11,19 @@
                <channels>
                        <channel id="todaySignal" typeId="signal">
                                <label>Today Signal</label>
-                               <description>The signal relating to the forecast consumption level for today. Values are 1 for normal consumption, 2
-                                       for strained electrical system and 3 for very strained electrical system.</description>
+                               <description>The signal relating to the forecast consumption level for today. Values are 1 for normal consumption
+                                       (green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red)).</description>
                        </channel>
                        <channel id="tomorrowSignal" typeId="signal">
                                <label>Tomorrow Signal</label>
                                <description>The signal relating to the forecast consumption level for tomorrow. Values are 1 for normal
-                                       consumption, 2 for strained electrical system and 3 for very strained electrical system.</description>
+                                       consumption
+                                       (green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red).</description>
                        </channel>
                        <channel id="currentHourSignal" typeId="signal">
                                <label>Current Hour Signal</label>
                                <description>The signal relating to the forecast consumption level for the current hour. Values are 1 for normal
-                                       consumption, 2 for strained electrical system and 3 for very strained electrical system.</description>
+                                       consumption (green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red).</description>
                        </channel>
                </channels>
 
@@ -42,13 +43,13 @@
        <channel-type id="signal">
                <item-type>Number</item-type>
                <label>Consumption Signal</label>
-               <description>The signal relating to the forecast consumption level. Values are 1 for normal consumption, 2 for
-                       strained electrical system and 3 for very strained electrical system.</description>
+               <description>The signal relating to the forecast consumption level. Values are 1 for normal consumption (green), 2 for
+                       strained electrical system (orange) and 3 for very strained electrical system (red).</description>
                <state readOnly="true">
                        <options>
-                               <option value="1">Green (normal consumption)</option>
-                               <option value="2">Orange (strained electrical system)</option>
-                               <option value="3">Red (very strained electrical system)</option>
+                               <option value="1">Green</option>
+                               <option value="2">Orange</option>
+                               <option value="3">Red</option>
                        </options>
                </state>
        </channel-type>