From e1a1f1f9de4d6d0b24d25ac1503b0e538c664c3f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 20 May 2010 16:13:55 +0000
Subject: [PATCH] Using "Due $typ" or "Starting $typ" as prefix for async
 notifications

---
 infolog/inc/class.infolog_bo.inc.php       | 5 ++++-
 infolog/inc/class.infolog_tracking.inc.php | 8 ++++++--
 infolog/lang/egw_de.lang                   | 4 +++-
 infolog/lang/egw_en.lang                   | 4 ++--
 4 files changed, 15 insertions(+), 6 deletions(-)

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 <id>[=<label>]	infolog	de	jeder Wert ist eine Zeile im Format id=[angezeigter Wert]
@@ -205,7 +206,6 @@ location	infolog	de	Ort
 longer textual description	infolog	de	längere textliche Beschreibung
 low	infolog	de	niedrig
 max length of the input [, length of the inputfield (optional)]	infolog	de	max. Länge der Eingabe [, Länge des Eingabefeldes (optional)]
-modifierer	infolog	de	Geändert von
 name must not be empty !!!	infolog	de	Name darf nicht leer sein !!!
 name of new type to create	infolog	de	Name des neu anzulegenden Types
 never hide search and filters	infolog	de	Suche und Filter niemals ausblenden
@@ -331,6 +331,7 @@ start a new search, cancel this link	infolog	de	eine neue Suche starten, diese V
 startdate	infolog	de	Startdatum
 startdate enddate	infolog	de	Startdatum Fälligkeitsdatum
 startdate for new entries	infolog	de	Startdatum für neue Einträge
+starting %1	infolog	de	%1 startet
 startrecord	infolog	de	Startdatensatz
 status	infolog	de	Status
 status ...	infolog	de	Status ...
@@ -339,6 +340,7 @@ sub-entries become subs of the parent or main entries, if there's no parent	info
 subject	infolog	de	Titel
 sum	infolog	de	Summe
 task	infolog	de	Aufgabe
+tasks of	infolog	de	Aufgaben von
 template	infolog	de	Vorlage
 test import (show importable records <u>only</u> in browser)	infolog	de	Test Import (zeige importierbare Datensätze <u>nur</u> im Browser)
 the name used internaly (<= 10 chars), changeing it makes existing data unavailible	infolog	de	der Name wird intern benutzt (<= 10 Zeichen), wenn er geändert wird, werden existierende Daten unzugänglich
diff --git a/infolog/lang/egw_en.lang b/infolog/lang/egw_en.lang
index c093bf21ca..fc90cb1545 100644
--- a/infolog/lang/egw_en.lang
+++ b/infolog/lang/egw_en.lang
@@ -130,6 +130,7 @@ do you want to receive notifications as html-mails or plain text?	infolog	en	Do
 don't show infolog	infolog	en	DON'T show InfoLog
 done	infolog	en	done
 download	infolog	en	Download
+due %1	infolog	en	Due %1
 duration	infolog	en	Duration
 e-mail:	infolog	en	E-mail:
 each value is a line like <id>[=<label>]	infolog	en	Each value is a line like <id>[=<label>]
@@ -205,8 +206,6 @@ location	infolog	en	Location
 longer textual description	infolog	en	longer textual description
 low	infolog	en	low
 max length of the input [, length of the inputfield (optional)]	infolog	en	max length of the input [, length of the input field (optional)]
-modifier	infolog	en	Modifier
-modifierer	infolog	en	Modifierer
 name must not be empty !!!	infolog	en	Name must not be empty !!!
 name of new type to create	infolog	en	name of new type to create
 never hide search and filters	infolog	en	Never hide search and filters
@@ -332,6 +331,7 @@ start a new search, cancel this link	infolog	en	start a new search, cancel this
 startdate	infolog	en	Start Date
 startdate enddate	infolog	en	Start Date Due Date
 startdate for new entries	infolog	en	Startdate for new entries
+starting %1	infolog	en	Starting %1
 startrecord	infolog	en	Startrecord
 status	infolog	en	Status
 status ...	infolog	en	Status ...