From f16928a1907b43db509b9bb5ecf7ddf8323616d0 Mon Sep 17 00:00:00 2001 From: jpawlowski Date: Mon, 2 Oct 2017 14:29:50 +0000 Subject: [PATCH] msgSchema.pm: fix language for AMADDevice, introduce MTYPE for TelegramBot git-svn-id: https://svn.fhem.de/fhem/trunk@15175 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/msgSchema.pm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/fhem/FHEM/msgSchema.pm b/fhem/FHEM/msgSchema.pm index e475cd398..37664dbc8 100755 --- a/fhem/FHEM/msgSchema.pm +++ b/fhem/FHEM/msgSchema.pm @@ -12,9 +12,9 @@ my $db = { 'audio' => { 'AMADDevice' => { - 'Normal' => 'set %DEVICE% ttsMsg &%LANG%; %MSGSHRT%', - 'ShortPrio' => 'set %DEVICE% ttsMsg &%LANG%; %SHOUTOUT%', - 'Short' => 'set %DEVICE% ttsMsg &%LANG%; %SHOUTOUT%', + 'Normal' => 'set %DEVICE% ttsMsg &%LANG%;; %MSGSHRT%', + 'ShortPrio' => 'set %DEVICE% ttsMsg &%LANG%;; %SHOUTOUT%', + 'Short' => 'set %DEVICE% ttsMsg &%LANG%;; %SHOUTOUT%', 'defaultValues' => { 'Normal' => { 'LANG' => 'de', @@ -254,18 +254,21 @@ my $db = { }, 'TelegramBot' => { - 'Normal' => 'set %DEVICE% message %RECIPIENT% %MSG%', - 'High' => 'set %DEVICE% message %RECIPIENT% %MSG%', - 'Low' => 'set %DEVICE% message %RECIPIENT% %MSG%', + 'Normal' => 'set %DEVICE% %TelegramBot_MTYPE% %RECIPIENT% %MSG%', + 'High' => 'set %DEVICE% %TelegramBot_MTYPE% %RECIPIENT% %MSG%', + 'Low' => 'set %DEVICE% %TelegramBot_MTYPE% %RECIPIENT% %MSG%', 'defaultValues' => { 'Normal' => { - 'RECIPIENT' => '', + 'RECIPIENT' => '', + 'TelegramBot_MTYPE' => 'message', }, 'High' => { - 'RECIPIENT' => '', + 'RECIPIENT' => '', + 'TelegramBot_MTYPE' => 'message', }, 'Low' => { - 'RECIPIENT' => '', + 'RECIPIENT' => '', + 'TelegramBot_MTYPE' => 'message', }, }, },