diff --git a/infolog/inc/class.infolog_bo.inc.php b/infolog/inc/class.infolog_bo.inc.php index 13e5c19023..c1558f9e3b 100644 --- a/infolog/inc/class.infolog_bo.inc.php +++ b/infolog/inc/class.infolog_bo.inc.php @@ -1424,24 +1424,27 @@ class infolog_bo if (is_null($this->tracking) || $this->tracking->user != $user) { - require_once(EGW_INCLUDE_ROOT.'/infolog/inc/class.infolog_tracking.inc.php'); $this->tracking = new infolog_tracking($this); } switch($pref) { case 'notify_due_responsible': + $info['prefix'] = lang('Due %1',$this->enums['type'][$info['info_type']]); $info['message'] = lang('%1 you are responsible for is due at %2',$this->enums['type'][$info['info_type']], $this->tracking->datetime($info['info_enddate'],false)); break; case 'notify_due_delegated': + $info['prefix'] = lang('Due %1',$this->enums['type'][$info['info_type']]); $info['message'] = lang('%1 you delegated is due at %2',$this->enums['type'][$info['info_type']], $this->tracking->datetime($info['info_enddate'],false)); break; case 'notify_start_responsible': + $info['prefix'] = lang('Starting %1',$this->enums['type'][$info['info_type']]); $info['message'] = lang('%1 you are responsible for is starting at %2',$this->enums['type'][$info['info_type']], $this->tracking->datetime($info['info_startdate'],null)); break; case 'notify_start_delegated': + $info['prefix'] = lang('Starting %1',$this->enums['type'][$info['info_type']]); $info['message'] = lang('%1 you delegated is starting at %2',$this->enums['type'][$info['info_type']], $this->tracking->datetime($info['info_startdate'],null)); break; diff --git a/infolog/inc/class.infolog_tracking.inc.php b/infolog/inc/class.infolog_tracking.inc.php index f21be618c1..258546020d 100644 --- a/infolog/inc/class.infolog_tracking.inc.php +++ b/infolog/inc/class.infolog_tracking.inc.php @@ -136,7 +136,11 @@ class infolog_tracking extends bo_tracking */ function get_subject($data,$old) { - if (!$old || $old['info_status'] == 'deleted') + if ($data['prefix']) + { + $prefix = $data['prefix']; // async notification + } + elseif (!$old || $old['info_status'] == 'deleted') { $prefix = lang('New %1',lang($this->infolog->enums['type'][$data['info_type']])); } @@ -254,7 +258,7 @@ class infolog_tracking extends bo_tracking /** * Track changes - * + * * Overrides parent to log the modified date in the history, but not to send a notification * * @param array $data current entry diff --git a/infolog/lang/egw_de.lang b/infolog/lang/egw_de.lang index 1ed61abec0..2f75a395a8 100644 --- a/infolog/lang/egw_de.lang +++ b/infolog/lang/egw_de.lang @@ -130,6 +130,7 @@ do you want to receive notifications as html-mails or plain text? infolog de Wol don't show infolog infolog de InfoLog NICHT anzeigen done infolog de erledigt download infolog de Datei laden +due %1 infolog de %1 fällig duration infolog de Dauer e-mail: infolog de E-Mail each value is a line like [=