N°6159 - Enhancement on mail notification screen (2)

dictionaries/en.dictionary.itop.core.php

@@ -521,32 +521,48 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:ActionEmail'                                    => 'Email notification',
 	'Class:ActionEmail+'                                   => '',
-	'Class:ActionEmail/Attribute:status+'                  => 'This status drives who will be notified: just the Test recipient, all (To, cc and Bcc) or no-one',
+	'Class:ActionEmail/Attribute:status+'                  => 'This status drives who will be notified: 
+- Being tested: just the Test recipient, 
+- In production: all (To, cc and Bcc) 
+- Inactive: no-one',
 	'Class:ActionEmail/Attribute:status/Value:test+'       => 'Only the Test recipient is notified',
 	'Class:ActionEmail/Attribute:status/Value:enabled+'    => 'All To, Cc and Bcc emails are notified',
 	'Class:ActionEmail/Attribute:status/Value:disabled+'   => 'The email notification will not be sent',
 	'Class:ActionEmail/Attribute:test_recipient'           => 'Test recipient',
-	'Class:ActionEmail/Attribute:test_recipient+'          => 'Destination email used when notification is being tested',
+	'Class:ActionEmail/Attribute:test_recipient+'          => 'Destination email address used instead of To, Cc and Bcc when notification is being tested',
 	'Class:ActionEmail/Attribute:from'                     => 'From (email)',
-	'Class:ActionEmail/Attribute:from+'                    => 'Sender email address will be sent into the email header',
+	'Class:ActionEmail/Attribute:from+'                    => 'Either a static email address or a placeholder like $this->agent_id->email$.
+The latest may not be accepted by some email servers.',
 	'Class:ActionEmail/Attribute:from_label'               => 'From (label)',
-	'Class:ActionEmail/Attribute:from_label+'              => 'Sender display name will be sent into the email header',
+	'Class:ActionEmail/Attribute:from_label+'              => 'Either a static label or a placeholder like $this->agent_id->friendlyname$',
 	'Class:ActionEmail/Attribute:reply_to'                 => 'Reply to (email)',
-	'Class:ActionEmail/Attribute:reply_to+'                => 'Reply to email address will be sent into the email header',
+	'Class:ActionEmail/Attribute:reply_to+'                => 'Either a static email address or a placeholder like $this->team_id->email$.
+If omitted the From (email) is used.',
 	'Class:ActionEmail/Attribute:reply_to_label'           => 'Reply to (label)',
-	'Class:ActionEmail/Attribute:reply_to_label+'          => 'Reply to display name will be sent into the email header',
+	'Class:ActionEmail/Attribute:reply_to_label+'          => 'Either a static label or a placeholder like $this->team_id->friendlyname$.
+If omitted the From (label) is used.',
 	'Class:ActionEmail/Attribute:to'                       => 'To',
-	'Class:ActionEmail/Attribute:to+'                      => 'Destination of the email',
+	'Class:ActionEmail/Attribute:to+'                      => 'To: an OQL query returning objects having an email field.
+While editing, click on the magnifier to get pertinent examples',
 	'Class:ActionEmail/Attribute:cc'                       => 'Cc',
-	'Class:ActionEmail/Attribute:cc+'                      => 'Carbon Copy',
+	'Class:ActionEmail/Attribute:cc+'                      => 'Carbon Copy: an OQL query returning objects having an email field.
+While editing, click on the magnifier to get pertinent examples',
 	'Class:ActionEmail/Attribute:bcc'                      => 'Bcc',
-	'Class:ActionEmail/Attribute:bcc+'                     => 'Blind Carbon Copy',
+	'Class:ActionEmail/Attribute:bcc+'                     => 'Blind Carbon Copy: an OQL query returning objects having an email field. 
+While editing, click on the magnifier to get pertinent examples',
 	'Class:ActionEmail/Attribute:subject'                  => 'Subject',
-	'Class:ActionEmail/Attribute:subject+'                 => 'Title of the email',
+	'Class:ActionEmail/Attribute:subject+'                 => 'Title of the email. Can contain placeholders like $this->attribute_code$',
 	'Class:ActionEmail/Attribute:body'                     => 'Body',
-	'Class:ActionEmail/Attribute:body+'                    => 'Contents of the email',
+	'Class:ActionEmail/Attribute:body+'                    => 'Contents of the email. Can contain placeholders like:
+- $this->attribute_code$ any attribute of the object triggering the notification,
+- $this->html(attribute_code)$ same as above but displayed in html format,
+- $this->hyperlink()$ hyperlink in the console to the object triggering the notification,
+- $this->hyperlink(portal)$ hyperlink in the portal to the object triggering the notification,
+- $this->head_html(case_log_attribute)$ last reply in html format of a caselog attribute,
+- $this->attribute_external_key->attribute$ recursive syntax for any remote attribute,
+- $current_contact->attribute$ attribute of the Person who triggered the notification',
 	'Class:ActionEmail/Attribute:importance'               => 'importance',
-	'Class:ActionEmail/Attribute:importance+'              => 'Importance flag',
+	'Class:ActionEmail/Attribute:importance+'              => 'Importance flag set on the generated email',
 	'Class:ActionEmail/Attribute:importance/Value:low'     => 'Low',
 	'Class:ActionEmail/Attribute:importance/Value:low+'    => '',
 	'Class:ActionEmail/Attribute:importance/Value:normal'  => 'Normal',