FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00
Code Issues Releases Wiki Activity

57_SSCal: accept calendar names which are contain umlauts

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23365 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2020-12-16 14:40:38 +00:00
parent 79a5f3d2f2
commit 13882dd9a2
3 changed files with 941 additions and 1512 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- bugfix: 57_SSCal: accept calendar names which are contain umlauts
- feature: 98_weekprofile: add support for MQTT2_DEVICE (txl Beta-User) - feature: 98_weekprofile: add support for MQTT2_DEVICE (txl Beta-User)
- feature: 89_FULLY: Added support for sensor information - feature: 89_FULLY: Added support for sensor information
- bugfix: 98_weekprofile: HMCCU-HM send profile without prefix (Forum #1104569) - bugfix: 98_weekprofile: HMCCU-HM send profile without prefix (Forum #1104569)

6
fhem/FHEM/57_SSCal.pm
View File

@ -69,6 +69,7 @@ use POSIX qw(strftime);
use Time::HiRes qw(gettimeofday); use Time::HiRes qw(gettimeofday);
use HttpUtils; use HttpUtils;
use Encode; use Encode;
use utf8;
use Blocking; use Blocking;
no if $] >= 5.017011, warnings => 'experimental::smartmatch'; no if $] >= 5.017011, warnings => 'experimental::smartmatch';
eval "use FHEM::Meta;1" or my $modMetaAbsent = 1; ## no critic 'eval' eval "use FHEM::Meta;1" or my $modMetaAbsent = 1; ## no critic 'eval'
@ -139,6 +140,7 @@ BEGIN {
# Versions History intern # Versions History intern
my %vNotesIntern = ( my %vNotesIntern = (
"2.4.8" => "16.12.2020 accep umlauts in calendar name ",
"2.4.7" => "08.12.2020 fix handle code recognition in createAtDevices as single line ", "2.4.7" => "08.12.2020 fix handle code recognition in createAtDevices as single line ",
"2.4.6" => "06.11.2020 bugfix weekly byDay ", "2.4.6" => "06.11.2020 bugfix weekly byDay ",
"2.4.5" => "03.11.2020 fix commandref wiki link ", "2.4.5" => "03.11.2020 fix commandref wiki link ",
@ -1401,7 +1403,7 @@ sub calOp_parse { ## no critic
$out .= "<tr><td> </td><td> </td><td> </td><td> </td><td> </td><td></tr>"; $out .= "<tr><td> </td><td> </td><td> </td><td> </td><td> </td><td></tr>";
while ($data->{data}[$i]) { while ($data->{data}[$i]) {
$dnm = $data->{data}[$i]{cal_displayname}; $dnm = encode("UTF-8", $data->{data}[$i]{cal_displayname});
next if (!$dnm); next if (!$dnm);
$typ = "Event" if($data->{data}[$i]{is_evt}); $typ = "Event" if($data->{data}[$i]{is_evt});
$typ = "ToDo" if($data->{data}[$i]{is_todo}); $typ = "ToDo" if($data->{data}[$i]{is_todo});
@ -2352,7 +2354,7 @@ sub writeValuesToArray { ## no
my @days; my @days;
(undef, undef, undef, undef, undef, undef, $bWday, undef, undef) = localtime($btimes); (undef, undef, undef, undef, undef, undef, $bWday, undef, undef) = localtime($btimes);
if($lang eq "DE") { if($lang eq "DE") {
@days = qw(Sontag Montag Dienstag Mittwoch Donnerstag Freitag Samstag); @days = qw(Sonntag Montag Dienstag Mittwoch Donnerstag Freitag Samstag);
} }
else { else {
@days = qw(Sunday Monday Tuesday Wednesday Thursday Friday Saturday); @days = qw(Sunday Monday Tuesday Wednesday Thursday Friday Saturday);

2168
fhem/contrib/DS_Starter/57_SSCal.pm
View File

File diff suppressed because it is too large Load Diff