Add missing entries to the default properties file (#11545)

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>

diff --git a/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/i18n/avmfritz.properties b/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/i18n/avmfritz.properties
index 24599414d852c6b2c81df244a9d007c6e1360a88..3a60e32708cd2357c73f9b57e68f7bd95bbaea52 100644 (file)
--- a/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/i18n/avmfritz.properties
+++ b/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/i18n/avmfritz.properties
@@ -17,6 +17,8 @@ thing-type.avmfritz.FRITZ_DECT_301.label = FRITZ!DECT 301
 thing-type.avmfritz.FRITZ_DECT_301.description = FRITZ!DECT 301 heating thermostat.
 thing-type.avmfritz.FRITZ_DECT_400.label = FRITZ!DECT 400
 thing-type.avmfritz.FRITZ_DECT_400.description = FRITZ!DECT400 switch.
+thing-type.avmfritz.FRITZ_DECT_400.channel.press.label = Button Press
+thing-type.avmfritz.FRITZ_DECT_400.channel.press.description = Triggeres SHORT_PRESSED or LONG_PRESSED when a button was pressed.
 thing-type.avmfritz.FRITZ_DECT_440.label = FRITZ!DECT 440
 thing-type.avmfritz.FRITZ_DECT_440.description = FRITZ!DECT440 switch.
 thing-type.avmfritz.FRITZ_DECT_440.group.bottom-left.label = Bottom Left Button
@@ -43,6 +45,8 @@ thing-type.avmfritz.HAN_FUN_ON_OFF.label = HAN-FUN On / Off Device
 thing-type.avmfritz.HAN_FUN_ON_OFF.description = HAN-FUN switchable device (e.g. SmartHome Zwischenstecker innen / SmartHome Zwischenstecker außen)
 thing-type.avmfritz.HAN_FUN_SWITCH.label = HAN-FUN Switch
 thing-type.avmfritz.HAN_FUN_SWITCH.description = HAN-FUN switch (e.g. SmartHome Wandtaster).
+thing-type.avmfritz.HAN_FUN_SWITCH.channel.press.label = Button Press
+thing-type.avmfritz.HAN_FUN_SWITCH.channel.press.description = Triggeres PRESSED when a button was pressed.
 thing-type.avmfritz.fritzbox.label = FRITZ!Box
 thing-type.avmfritz.fritzbox.description = A FRITZ!Box router.
 
@@ -139,6 +143,7 @@ channel-type.avmfritz.incoming_call.label = Incoming Call
 channel-type.avmfritz.incoming_call.description = Details about incoming call.
 channel-type.avmfritz.last_change.label = Last Change
 channel-type.avmfritz.last_change.description = States the last time the button was pressed.
+channel-type.avmfritz.last_change.state.pattern = %1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS
 channel-type.avmfritz.locked.label = Device Locked (external)
 channel-type.avmfritz.locked.description = Device is locked for switching over external sources.
 channel-type.avmfritz.mode.label = Mode
@@ -148,6 +153,7 @@ channel-type.avmfritz.mode.state.option.AUTOMATIC = Automatic
 channel-type.avmfritz.mode.state.option.VACATION = Vacation
 channel-type.avmfritz.next_change.label = Next Setpoint Change
 channel-type.avmfritz.next_change.description = Next change of Setpoint Temperature.
+channel-type.avmfritz.next_change.state.pattern = %1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS
 channel-type.avmfritz.next_temp.label = Next Setpoint Temperature
 channel-type.avmfritz.next_temp.description = Next Setpoint Temperature.
 channel-type.avmfritz.outgoing_call.label = Outgoing Call
@@ -178,15 +184,6 @@ channel-type.avmfritz.voltage.description = Current voltage.
 channel-type.config.avmfritz.temperature.offset.label = Temperature Offset
 channel-type.config.avmfritz.temperature.offset.description = Current temperature offset (in °C).
 
-# channel types
-
-channel-type.avmfritz.last_change.pattern = %1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS
-channel-type.avmfritz.next_change.pattern = %1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS
-thing-type.avmfritz.FRITZ_DECT_400.channel.press.label = Button Press
-thing-type.avmfritz.FRITZ_DECT_400.channel.press.description = Triggers SHORT_PRESSED or LONG_PRESSED when a button was pressed.
-thing-type.avmfritz.HAN_FUN_SWITCH.channel.press.label = Button Press
-thing-type.avmfritz.HAN_FUN_SWITCH.channel.press.description = Triggers PRESSED when a button was pressed.
-
 # thing actions
 
 setBoostModeModeActionLabel = set the Boost mode

diff --git a/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/i18n/avmfritz_de.properties b/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/i18n/avmfritz_de.properties
index 7a5ac04374895470e9ca85999d4c6c40e6ceeb4f..aa46a83e155cf01e342919dfbaec33d01e5d6751 100644 (file)
--- a/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/i18n/avmfritz_de.properties
+++ b/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/i18n/avmfritz_de.properties
@@ -203,7 +203,6 @@ channel-type.avmfritz.radiator_mode.state.option.WINDOW_OPEN = Fenster-Auf
 
 channel-type.avmfritz.next_change.label = Nächste Änderung
 channel-type.avmfritz.next_change.description = Zeigt den Zeitpunkt der nächsten Änderung der Solltemperatur des Heizkörperreglers an.
-channel-type.avmfritz.next_change.pattern = %1$td.%1$tm.%1$tY %1$tH\:%1$tM\:%1$tS
 
 channel-type.avmfritz.next_temp.label = Nächste Solltemperatur
 channel-type.avmfritz.next_temp.description = Zeigt die nächste Solltemperatur des Heizkörperreglers an.
@@ -222,7 +221,6 @@ channel-type.avmfritz.rollershutter.description = Steuert den Rollladen und zeig
 
 channel-type.avmfritz.last_change.label = Letzte Änderung
 channel-type.avmfritz.last_change.description = Zeigt an, wann der Schalter zuletzt gedrückt wurde.
-channel-type.avmfritz.last_change.pattern = %1$td.%1$tm.%1$tY %1$tH\:%1$tM\:%1$tS
 
 # channel types config
 channel-type.config.avmfritz.temperature.offset.label = Temperatur-Offset

diff --git a/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/channel-types.xml b/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/channel-types.xml
index 9c64ede171027fc230a8d5d22282a01ccb534de1..2c80f7ff878ec2b159ee7b211c245dd61dcaac38 100644 (file)
--- a/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/channel-types.xml
+++ b/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/channel-types.xml
@@ -205,7 +205,7 @@
                <label>Next Setpoint Change</label>
                <description>Next change of Setpoint Temperature.</description>
                <category>Time</category>
-               <state readOnly="true"/>
+               <state readOnly="true" pattern="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"/>
        </channel-type>
 
        <channel-type id="next_temp" advanced="true">
@@ -229,7 +229,7 @@
                <label>Last Change</label>
                <description>States the last time the button was pressed.</description>
                <category>Time</category>
-               <state readOnly="true"/>
+               <state readOnly="true" pattern="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"/>
        </channel-type>
 
        <channel-type id="rollershutter">