FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-21 07:56:03 +00:00
Code Issues Releases Wiki Activity

UConv.pm: add pre-defined combined valute+unit variables value_unit_long and value_unit

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12495 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2016-11-03 08:23:26 +00:00
parent 17d12a3aa0
commit 3fa652bd95
1 changed files with 81 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
fhem/FHEM/UConv.pm
View File

@ -1059,7 +1059,7 @@ my %units = (
sub UnitDetails ($;$) { sub UnitDetails ($;$) {
my ( $unit, $lang ) = @_; my ( $unit, $lang ) = @_;
my $u = lc($unit); my $u = lc($unit);
my $l = ( $lang ? lc($lang) : undef ); my $l = ( $lang ? lc($lang) : "en" );
my %details; my %details;
if ( defined( $units{$u} ) ) { if ( defined( $units{$u} ) ) {
@ -1068,23 +1068,60 @@ sub UnitDetails ($;$) {
} }
$details{"unit_abbr"} = $u; $details{"unit_abbr"} = $u;
if ( $l && $details{"unit_prefix"} ) { if ($lang) {
delete $details{"unit_prefix"}; $details{"lang"} = $l;
if ( $units{$u}{"unit_prefix"}{$l} ) {
$details{"unit_prefix"} = $units{$u}{"unit_prefix"}{$l};
}
else {
$details{"unit_prefix"} = $units{$u}{"unit_prefix"}{"en"};
}
}
if ( $l && $details{"unit_long"} ) { if ( $details{"txt_format"} ) {
delete $details{"unit_long"}; delete $details{"txt_format"};
if ( $units{$u}{"unit_long"}{$l} ) { if ( $units{$u}{"txt_format"}{$l} ) {
$details{"unit_long"} = $units{$u}{"unit_long"}{$l}; $details{"txt_format"} = $units{$u}{"txt_format"}{$l};
}
elsif ( refs( $units{$u}{"txt_format"} ) ne "HASH" ) {
$details{"txt_format"} = $units{$u}{"txt_format"};
}
} }
else {
$details{"unit_long"} = $units{$u}{"unit_long"}{"en"}; if ( $details{"txt_format_long"} ) {
delete $details{"txt_format_long"};
if ( $units{$u}{"txt_format_long"}{$l} ) {
$details{"txt_format_long"} =
$units{$u}{"txt_format_long"}{$l};
}
elsif ( refs( $units{$u}{"txt_format_long"} ) ne "HASH" ) {
$details{"txt_format_long"} = $units{$u}{"txt_format_long"};
}
}
if ( $details{"txt_format_long_pl"} ) {
delete $details{"txt_format_long_pl"};
if ( $units{$u}{"txt_format_long_pl"}{$l} ) {
$details{"txt_format_long_pl"} =
$units{$u}{"txt_format_long_pl"}{$l};
}
elsif ( refs( $units{$u}{"txt_format_long_pl"} ) ne "HASH" ) {
$details{"txt_format_long_pl"} =
$units{$u}{"txt_format_long_pl"};
}
}
if ( $details{"unit_long"} ) {
delete $details{"unit_long"};
if ( $units{$u}{"unit_long"}{$l} ) {
$details{"unit_long"} = $units{$u}{"unit_long"}{$l};
}
elsif ( refs( $units{$u}{"unit_long"} ) ne "HASH" ) {
$details{"unit_long"} = $units{$u}{"unit_long"};
}
}
if ( $details{"unit_long_pl"} ) {
delete $details{"unit_long_pl"};
if ( $units{$u}{"unit_long_pl"}{$l} ) {
$details{"unit_long_pl"} = $units{$u}{"unit_long_pl"}{$l};
}
elsif ( refs( $units{$u}{"unit_long_pl"} ) ne "HASH" ) {
$details{"unit_long_pl"} = $units{$u}{"unit_long_pl"};
}
} }
} }
@ -1613,7 +1650,7 @@ sub rname2unitDetails ($;$$) {
return if ( !%return && !$u ); return if ( !%return && !$u );
return \%return if ( !$u ); return \%return if ( !$u );
my $unitDetails = UnitDetails( $u, $lang ); my $unitDetails = UnitDetails( $u, $l );
if ( ref($unitDetails) eq "HASH" ) { if ( ref($unitDetails) eq "HASH" ) {
$return{"unit_guess"} = "1" if ( !$return{"short"} ); $return{"unit_guess"} = "1" if ( !$return{"short"} );
@ -1637,42 +1674,33 @@ sub rname2unitDetails ($;$$) {
$return{"value_unit"} = $txt; $return{"value_unit"} = $txt;
} }
# # value > 1 # plural
# if ( Scalar::Util::looks_like_number($value) if ( Scalar::Util::looks_like_number($value)
# && $value > 1 && $value > 1
# && $return{"unit_long_pl"} ) && $return{"unit_long_pl"} )
# { {
# my $txt = "%value% %unit_long_pl%"; my $txt = '%value% %unit_long_pl%';
# if ( %{%return}{"txt_format_long_pl"}->${{$l}} ) { $txt = $return{"txt_format_long_pl"}
# $txt = $return{"txt_format_long_pl"}->{$l}; if ( $return{"txt_format_long_pl"} );
# }
# elsif ( $return{"txt_format_long_pl"} ) { foreach my $k ( keys %return ) {
# $txt = $return{"txt_format_long_pl"}; $txt =~ s/%$k%/$return{$k}/g;
# } }
#
# foreach my $k ( keys %return ) { $return{"value_unit_long"} = $txt;
# $txt =~ s/%$k%/$return{$k}/g; }
# }
# # single
# $return{"value_unit_long"} = $txt; elsif ( $return{"unit_long"} ) {
# } my $txt = '%value% %unit_long%';
# $txt = $return{"txt_format_long"} if ( $return{"txt_format_long"} );
# # single value
# elsif ( $return{"unit_long"} ) { foreach my $k ( keys %return ) {
# my $txt = "%value% %unit_long%"; $txt =~ s/%$k%/$return{$k}/g;
# if ( $return{"txt_format_long"}->{$l} ) { }
# $txt = $return{"txt_format_long"}->{$l};
# } $return{"value_unit_long"} = $txt;
# elsif ( $return{"txt_format_long"} ) { }
# $txt = $return{"txt_format_long"};
# }
#
# foreach my $k ( keys %return ) {
# $txt =~ s/%$k%/$return{$k}/g;
# }
#
# $return{"value_unit_long"} = $txt;
# }
} }
return \%return; return \%return;