From 9f19ed88178e2afae775c658c2d50b52870ccbd5 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 7 Apr 2022 19:49:40 +0200 Subject: [PATCH] fix locales, todo change view of remaining time --- FHEM/74_GardenaSmartDevice.pm | 21 +++++++++++---------- controls_GardenaSmartDevice.txt | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/FHEM/74_GardenaSmartDevice.pm b/FHEM/74_GardenaSmartDevice.pm index f29119d..708ec83 100644 --- a/FHEM/74_GardenaSmartDevice.pm +++ b/FHEM/74_GardenaSmartDevice.pm @@ -280,7 +280,11 @@ sub Set { my $service_id; my $mainboard_version = ReadingsVal( $name, 'mower_type-mainboard_version', 0.0 ); - my $timezone_offset = ( Time::Piece->new )->tzoffset; + + my ($Sekunden, $Minuten, $Stunden, $Monatstag, $Monat, + $Jahr, $Wochentag, $Jahrestag, $Sommerzeit) = localtime(time); + + my $timezone_offset = $Sommerzeit ? 0 : ( Time::Piece->new )->tzoffset; #set default abilitie ... overwrite in cmd to change $abilities = 'mower' @@ -881,12 +885,12 @@ sub setState { ? ( ReadingsVal($name, 'scheduling-schedules_paused_until', '' ) eq '' ) # leer ( zeitplan aktiv ... ) - ? sprintf( (RigReadingsValue($hash, 'watering. %s minutes remaining.').' '.RigReadingsValue($hash, 'next timer: %s')), ReadingsVal( $name, 'watering-watering_timer_1_duration', 0 ), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-scheduled_watering_next_start', '')) ) + ? sprintf( (RigReadingsValue($hash, 'will be irrigated %s minutes remaining.').' '.RigReadingsValue($hash, 'next watering: %s')), ReadingsVal( $name, 'watering-watering_timer_1_duration', 0 ), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-scheduled_watering_next_start', '')) ) # zeitplan pausiert : ( ReadingsVal($name, 'scheduling-schedules_paused_until', '') eq '2038-01-18T00:00:00.000Z') # pause bis dauerhaft - ? sprintf( (RigReadingsValue($hash, 'watering. %s minutes remaining.').' '.RigReadingsValue($hash , 'permanently paused')), ReadingsVal( $name, 'watering-watering_timer_1_duration', 0 )) + ? sprintf( (RigReadingsValue($hash, 'will be irrigated %s minutes remaining.').' '.RigReadingsValue($hash , 'schedule permanently paused')), ReadingsVal( $name, 'watering-watering_timer_1_duration', 0 )) # naechter termin : sprintf( RigReadingsValue($hash , 'paused until %s'), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-schedules_paused_until', '')) ) @@ -895,7 +899,7 @@ sub setState { : ( ReadingsVal($name, 'scheduling-schedules_paused_until', '' ) eq '' ) # zeitplan aktiv - ? sprintf( RigReadingsValue($hash, 'next timer: %s'), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-scheduled_watering_next_start', '') ) ) + ? sprintf( RigReadingsValue($hash, 'next watering: %s'), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-scheduled_watering_next_start', '') ) ) # zeitplan pausiert : RigReadingsValue($hash, 'closed') @@ -1072,13 +1076,10 @@ sub ReadingLangGerman { 'inactive' => 'nicht aktiv', 'hibernate' => 'Winterschlaf', 'awake' => 'Aufgewacht', - - 'permanently paused' => 'Dauerhaft pausiert', + 'schedule permanently paused' => 'Zeitplan dauerhaft pausiert', 'paused until %s' => 'pausiert bis %s', - 'watering. %s minutes remaining.'=> 'Wird bewässert. %d Minuten verbleibend.', - 'next timer: %s' => 'Nächste Bewässerung: %s', - - + 'will be irrigated %s minutes remaining.'=> 'Wird bewässert. %d Minuten verbleibend.', + 'next watering: %s' => 'Nächste Bewässerung: %s', ); if ( diff --git a/controls_GardenaSmartDevice.txt b/controls_GardenaSmartDevice.txt index 6d0a5e7..bf86ace 100644 --- a/controls_GardenaSmartDevice.txt +++ b/controls_GardenaSmartDevice.txt @@ -1,2 +1,2 @@ UPD 2022-03-29_13:42:09 49520 FHEM/73_GardenaSmartBridge.pm -UPD 2022-04-07_14:49:06 62210 FHEM/74_GardenaSmartDevice.pm +UPD 2022-04-07_19:49:15 62409 FHEM/74_GardenaSmartDevice.pm