From 7c8b149abf8f8f25ec60a9908e8dc9f85f7e7ae6 Mon Sep 17 00:00:00 2001 From: jpawlowski Date: Sun, 5 Mar 2017 19:13:00 +0000 Subject: [PATCH] 10_RESIDENTS: copy lang to new slaves git-svn-id: https://svn.fhem.de/fhem/trunk@13618 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_RESIDENTS.pm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/fhem/FHEM/10_RESIDENTS.pm b/fhem/FHEM/10_RESIDENTS.pm index 35473cd06..169aa6ecb 100644 --- a/fhem/FHEM/10_RESIDENTS.pm +++ b/fhem/FHEM/10_RESIDENTS.pm @@ -447,9 +447,13 @@ sub RESIDENTS_Set($@) { return "Can't create, device $rr_name already existing." unless ( $defs{$rr_name}{TYPE} eq "ROOMMATE" ); - fhem( "attr " . $rr_name . "rr_lang" . uc( $a[3] ) ) - if ( defined( $a[3] ) - && AttrVal( $rr_name, "rr_lang", "EN" ) ne uc( $a[3] ) ); + my $lang = + $a[3] + ? uc( $a[3] ) + : AttrVal( $rr_name, "rr_lang", + AttrVal( $name, "rgr_lang", undef ) ); + fhem( "attr " . $rr_name . " rr_lang " . $lang ) + if ($lang); $attr{$rr_name}{comment} = "Auto-created by $name" unless ( defined( $attr{$rr_name}{comment} ) @@ -503,9 +507,13 @@ sub RESIDENTS_Set($@) { return "Can't create, device $rg_name already existing." unless ( $defs{$rg_name}{TYPE} eq "GUEST" ); - fhem( "attr " . $rg_name . "rg_lang" . uc( $a[3] ) ) - if ( defined( $a[3] ) - && AttrVal( $rg_name, "rg_lang", "EN" ) ne uc( $a[3] ) ); + my $lang = + $a[3] + ? uc( $a[3] ) + : AttrVal( $rg_name, "rg_lang", + AttrVal( $name, "rgr_lang", undef ) ); + fhem( "attr " . $rg_name . " rg_lang " . $lang ) + if ($lang); $attr{$rg_name}{comment} = "Auto-created by $name" unless ( defined( $attr{$rg_name}{comment} )