composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-17 22:39:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°3287 - Set from display name / label in action email

Browse Source 
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@me.com>
This commit is contained in:
Lars Kaltefleiter
2020-09-03 16:44:31 +02:00
committed by Molkobain
parent 11f00cc229
commit 43cadb0ede
17 changed files with 139 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/action.class.inc.php
View File

@@ -191,7 +191,9 @@ class ActionEmail extends ActionNotification
MetaModel::Init_AddAttribute(new AttributeEmailAddress("test_recipient", array("allowed_values"=>null, "sql"=>"test_recipient", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeString("from", array("allowed_values"=>null, "sql"=>"from", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeString("from_label", array("allowed_values"=>null, "sql"=>"from_label", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeString("reply_to", array("allowed_values"=>null, "sql"=>"reply_to", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeString("reply_to_label", array("allowed_values"=>null, "sql"=>"reply_to_label", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeOQL("to", array("allowed_values"=>null, "sql"=>"to", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeOQL("cc", array("allowed_values"=>null, "sql"=>"cc", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeOQL("bcc", array("allowed_values"=>null, "sql"=>"bcc", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
@@ -201,7 +203,7 @@ class ActionEmail extends ActionNotification
// Display lists
// - Attributes to be displayed for the complete details
MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'test_recipient', 'from', 'reply_to', 'to', 'cc', 'bcc', 'subject', 'body', 'importance', 'trigger_list'));
MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'test_recipient', 'from', 'from_label', 'reply_to', 'reply_to_label', 'to', 'cc', 'bcc', 'subject', 'body', 'importance', 'trigger_list'));
// - Attributes to be displayed for a list
MetaModel::Init_SetZListItems('list', array('name', 'status', 'to', 'subject'));
// Search criteria
@@ -374,10 +376,12 @@ class ActionEmail extends ActionNotification
$sTo = $this->FindRecipients('to', $aContextArgs);
$sCC = $this->FindRecipients('cc', $aContextArgs);
$sBCC = $this->FindRecipients('bcc', $aContextArgs);
$sFrom = MetaModel::ApplyParams($this->Get('from'), $aContextArgs);
$sFromLabel = MetaModel::ApplyParams($this->Get('from_label'), $aContextArgs);
$sReplyTo = MetaModel::ApplyParams($this->Get('reply_to'), $aContextArgs);
$sReplyToLabel = MetaModel::ApplyParams($this->Get('reply_to_label'), $aContextArgs);
$sSubject = MetaModel::ApplyParams($this->Get('subject'), $aContextArgs);
$sBody = MetaModel::ApplyParams($this->Get('body'), $aContextArgs);
@@ -400,7 +404,7 @@ class ActionEmail extends ActionNotification
if (isset($sTo)) $oLog->Set('to', $sTo);
if (isset($sCC)) $oLog->Set('cc', $sCC);
if (isset($sBCC)) $oLog->Set('bcc', $sBCC);
if (isset($sFrom)) $oLog->Set('from', $sFrom);
if (isset($sFrom)) $oLog->Set('from', empty($sFromLabel) ? $sFrom : "$sFromLabel <$sFrom>");
if (isset($sSubject)) $oLog->Set('subject', $sSubject);
if (isset($sBody)) $oLog->Set('body', $sBody);
}
@@ -420,15 +424,15 @@ class ActionEmail extends ActionNotification
$sTestBody .= "<li>TO: $sTo</li>\n";
$sTestBody .= "<li>CC: $sCC</li>\n";
$sTestBody .= "<li>BCC: $sBCC</li>\n";
$sTestBody .= "<li>From: $sFrom</li>\n";
$sTestBody .= "<li>Reply-To: $sReplyTo</li>\n";
$sTestBody .= empty($sFromLabel) ? "<li>From: $sFrom</li>\n": "<li>From: $sFromLabel &lt;$sFrom&gt;</li>\n";
$sTestBody .= empty($sReplyToLabel) ? "<li>Reply-To: $sReplyTo</li>\n": "<li>Reply-To: $sReplyToLabel &lt;$sReplyTo&gt;</li>\n";
$sTestBody .= "<li>References: $sReference</li>\n";
$sTestBody .= "</ul>\n";
$sTestBody .= "</p>\n";
$sTestBody .= "</div>\n";
$oEmail->SetBody($sTestBody, 'text/html', $sStyles);
$oEmail->SetRecipientTO($this->Get('test_recipient'));
$oEmail->SetRecipientFrom($sFrom);
$oEmail->SetRecipientFrom($sFrom, $sFromLabel);
$oEmail->SetReferences($sReference);
$oEmail->SetMessageId($sMessageId);
}
@@ -439,8 +443,8 @@ class ActionEmail extends ActionNotification
$oEmail->SetRecipientTO($sTo);
$oEmail->SetRecipientCC($sCC);
$oEmail->SetRecipientBCC($sBCC);
$oEmail->SetRecipientFrom($sFrom);
$oEmail->SetRecipientReplyTo($sReplyTo);
$oEmail->SetRecipientFrom($sFrom, $sFromLabel);
$oEmail->SetRecipientReplyTo($sReplyTo, $sReplyToLabel);
$oEmail->SetReferences($sReference);
$oEmail->SetMessageId($sMessageId);
}

12
core/email.class.inc.php
View File

@@ -100,7 +100,7 @@ class EMail
}
if (array_key_exists('reply_to', $aData))
{
$oMessage->SetRecipientReplyTo($aData['reply_to']);
$oMessage->SetRecipientReplyTo($aData['reply_to']['address'], $aData['reply_to']['label']);
}
if (array_key_exists('to', $aData))
{
@@ -465,10 +465,14 @@ class EMail
}
}
public function SetRecipientReplyTo($sAddress)
public function SetRecipientReplyTo($sAddress, $sLabel = '')
{
$this->m_aData['reply_to'] = $sAddress;
if (!empty($sAddress))
$this->m_aData['reply_to'] = array('address' => $sAddress, 'label' => $sLabel);
if ($sLabel != '')
{
$this->m_oMessage->setReplyTo(array($sAddress => $sLabel));
}
else if (!empty($sAddress))
{
$this->m_oMessage->setReplyTo($sAddress);
}

12
dictionaries/cs.dictionary.itop.core.php
View File

@@ -507,10 +507,14 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'Class:ActionEmail+' => '',
'Class:ActionEmail/Attribute:test_recipient' => 'Adresát pro test',
'Class:ActionEmail/Attribute:test_recipient+' => 'Cílová adresa pro případ, kdy je stav nastaven na "Testování"',
'Class:ActionEmail/Attribute:from' => 'Odesílatel',
'Class:ActionEmail/Attribute:from+' => '',
'Class:ActionEmail/Attribute:reply_to' => 'Odpověď na',
'Class:ActionEmail/Attribute:reply_to+' => '',
'Class:ActionEmail/Attribute:from' => 'Odesílatel~~',
'Class:ActionEmail/Attribute:from+' => '~~',
'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:reply_to' => 'Odpověď na~~',
'Class:ActionEmail/Attribute:reply_to+' => '~~',
'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:to' => 'To',
'Class:ActionEmail/Attribute:to+' => 'Adresát',
'Class:ActionEmail/Attribute:cc' => 'Cc',

12
dictionaries/da.dictionary.itop.core.php
View File

@@ -505,10 +505,14 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Class:ActionEmail+' => '',
'Class:ActionEmail/Attribute:test_recipient' => 'Test modtager',
'Class:ActionEmail/Attribute:test_recipient+' => '',
'Class:ActionEmail/Attribute:from' => 'Fra',
'Class:ActionEmail/Attribute:from+' => 'Afsender af emailen',
'Class:ActionEmail/Attribute:reply_to' => 'Svar til',
'Class:ActionEmail/Attribute:reply_to+' => 'Svar sendes til',
'Class:ActionEmail/Attribute:from' => 'Fra~~',
'Class:ActionEmail/Attribute:from+' => 'Afsender af emailen~~',
'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:reply_to' => 'Svar til~~',
'Class:ActionEmail/Attribute:reply_to+' => 'Svar sendes til~~',
'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:to' => 'Til',
'Class:ActionEmail/Attribute:to+' => 'Modtager af emailen',
'Class:ActionEmail/Attribute:cc' => 'Cc',

10
dictionaries/de.dictionary.itop.core.php
View File

@@ -504,10 +504,14 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
'Class:ActionEmail+' => '',
'Class:ActionEmail/Attribute:test_recipient' => 'Testempfänger',
'Class:ActionEmail/Attribute:test_recipient+' => 'Empfänger im Fall eines "Test"-Status',
'Class:ActionEmail/Attribute:from' => 'Von',
'Class:ActionEmail/Attribute:from+' => 'Wird im Email-Header mitgesendet',
'Class:ActionEmail/Attribute:reply_to' => 'Antworten an',
'Class:ActionEmail/Attribute:from' => 'Von (E-Mail)',
'Class:ActionEmail/Attribute:from+' => 'Absenderad­res­se wird im Email-Header mitgesendet',
'Class:ActionEmail/Attribute:from_label' => 'Von (Label)',
'Class:ActionEmail/Attribute:from_label+' => 'Absendername wird im Email-Header mitgesendet',
'Class:ActionEmail/Attribute:reply_to' => 'Antworten an (E-Mail)',
'Class:ActionEmail/Attribute:reply_to+' => 'Wird im Email-Header mitgesendet',
'Class:ActionEmail/Attribute:reply_to_label' => 'Antworten an (Label)',
'Class:ActionEmail/Attribute:reply_to_label+' => 'Wird im Email-Header mitgesendet',
'Class:ActionEmail/Attribute:to' => 'An',
'Class:ActionEmail/Attribute:to+' => 'Empfänger der Nachricht',
'Class:ActionEmail/Attribute:cc' => 'Kopie an',

14
dictionaries/en.dictionary.itop.core.php
View File

@@ -504,11 +504,15 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:ActionEmail' => 'Email notification',
'Class:ActionEmail+' => '',
'Class:ActionEmail/Attribute:test_recipient' => 'Test recipient',
'Class:ActionEmail/Attribute:test_recipient+' => 'Detination in case status is set to "Test"',
'Class:ActionEmail/Attribute:from' => 'From',
'Class:ActionEmail/Attribute:from+' => 'Will be sent into the email header',
'Class:ActionEmail/Attribute:reply_to' => 'Reply to',
'Class:ActionEmail/Attribute:reply_to+' => 'Will be sent into the email header',
'Class:ActionEmail/Attribute:test_recipient+' => 'Destination in case status is set to "Test"',
'Class:ActionEmail/Attribute:from' => 'From (email)',
'Class:ActionEmail/Attribute:from+' => 'Sender email address will be sent into the email header',
'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: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_label' => 'Reply to (label)',
'Class:ActionEmail/Attribute:reply_to_label+' => 'Reply to display name will be sent into the email header',
'Class:ActionEmail/Attribute:to' => 'To',
'Class:ActionEmail/Attribute:to+' => 'Destination of the email',
'Class:ActionEmail/Attribute:cc' => 'Cc',

12
dictionaries/es_cr.dictionary.itop.core.php
View File

@@ -505,10 +505,14 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Class:ActionEmail+' => 'Notificación por Correo Electrónico',
'Class:ActionEmail/Attribute:test_recipient' => 'Destinatario de Prueba',
'Class:ActionEmail/Attribute:test_recipient+' => 'Destinatario en caso que el Estatus sea "En pruebas"',
'Class:ActionEmail/Attribute:from' => 'Remitente',
'Class:ActionEmail/Attribute:from+' => 'Será enviando en el encabezado del Correo Electrónico',
'Class:ActionEmail/Attribute:reply_to' => 'Responder a',
'Class:ActionEmail/Attribute:reply_to+' => 'Será enviando en el encabezado del Correo Electrónico',
'Class:ActionEmail/Attribute:from' => 'Remitente~~',
'Class:ActionEmail/Attribute:from+' => 'Será enviando en el encabezado del Correo Electrónico~~',
'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:reply_to' => 'Responder a~~',
'Class:ActionEmail/Attribute:reply_to+' => 'Será enviando en el encabezado del Correo Electrónico~~',
'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:to' => 'Para',
'Class:ActionEmail/Attribute:to+' => 'Destinatario del Correo Electrónico',
'Class:ActionEmail/Attribute:cc' => 'CC',

12
dictionaries/fr.dictionary.itop.core.php
View File

@@ -503,10 +503,14 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:ActionEmail+' => '',
'Class:ActionEmail/Attribute:test_recipient' => 'Destinataire de test',
'Class:ActionEmail/Attribute:test_recipient+' => '',
'Class:ActionEmail/Attribute:from' => 'De',
'Class:ActionEmail/Attribute:from+' => '',
'Class:ActionEmail/Attribute:reply_to' => 'Répondre à',
'Class:ActionEmail/Attribute:reply_to+' => '',
'Class:ActionEmail/Attribute:from' => 'De~~',
'Class:ActionEmail/Attribute:from+' => '~~',
'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:reply_to' => 'Répondre à~~',
'Class:ActionEmail/Attribute:reply_to+' => '~~',
'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:to' => 'A',
'Class:ActionEmail/Attribute:to+' => '',
'Class:ActionEmail/Attribute:cc' => 'Copie',

12
dictionaries/hu.dictionary.itop.core.php
View File

@@ -503,10 +503,14 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'Class:ActionEmail+' => '',
'Class:ActionEmail/Attribute:test_recipient' => 'Teszt címzett',
'Class:ActionEmail/Attribute:test_recipient+' => '',
'Class:ActionEmail/Attribute:from' => 'Feladó',
'Class:ActionEmail/Attribute:from+' => '',
'Class:ActionEmail/Attribute:reply_to' => 'Válasz',
'Class:ActionEmail/Attribute:reply_to+' => '',
'Class:ActionEmail/Attribute:from' => 'Feladó~~',
'Class:ActionEmail/Attribute:from+' => '~~',
'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:reply_to' => 'Válasz~~',
'Class:ActionEmail/Attribute:reply_to+' => '~~',
'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:to' => 'Címzett',
'Class:ActionEmail/Attribute:to+' => '',
'Class:ActionEmail/Attribute:cc' => 'Másolatot kap',

12
dictionaries/it.dictionary.itop.core.php
View File

@@ -505,10 +505,14 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:ActionEmail+' => '',
'Class:ActionEmail/Attribute:test_recipient' => 'Test destinatario',
'Class:ActionEmail/Attribute:test_recipient+' => '',
'Class:ActionEmail/Attribute:from' => 'Da',
'Class:ActionEmail/Attribute:from+' => '',
'Class:ActionEmail/Attribute:reply_to' => 'Rispondi A',
'Class:ActionEmail/Attribute:reply_to+' => '',
'Class:ActionEmail/Attribute:from' => 'Da~~',
'Class:ActionEmail/Attribute:from+' => '~~',
'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:reply_to' => 'Rispondi A~~',
'Class:ActionEmail/Attribute:reply_to+' => '~~',
'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:to' => 'A',
'Class:ActionEmail/Attribute:to+' => 'Destinatario dell\'email',
'Class:ActionEmail/Attribute:cc' => 'Cc',

12
dictionaries/ja.dictionary.itop.core.php
View File

@@ -503,10 +503,14 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Class:ActionEmail+' => '',
'Class:ActionEmail/Attribute:test_recipient' => 'テストレシピ',
'Class:ActionEmail/Attribute:test_recipient+' => '状態がテストの場合の宛先',
'Class:ActionEmail/Attribute:from' => 'From',
'Class:ActionEmail/Attribute:from+' => '電子メールのヘッダーに挿入されます',
'Class:ActionEmail/Attribute:reply_to' => 'Reply to',
'Class:ActionEmail/Attribute:reply_to+' => '電子メールのヘッダーに挿入されます',
'Class:ActionEmail/Attribute:from' => 'From~~',
'Class:ActionEmail/Attribute:from+' => '電子メールのヘッダーに挿入されます~~',
'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:reply_to' => 'Reply to~~',
'Class:ActionEmail/Attribute:reply_to+' => '電子メールのヘッダーに挿入されます~~',
'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:to' => 'To',
'Class:ActionEmail/Attribute:to+' => 'メールの宛先',
'Class:ActionEmail/Attribute:cc' => 'Cc',

8
dictionaries/nl.dictionary.itop.core.php
View File

@@ -511,10 +511,14 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:ActionEmail+' => '',
'Class:ActionEmail/Attribute:test_recipient' => 'Testontvanger',
'Class:ActionEmail/Attribute:test_recipient+' => 'Bestemming als de status op "Test" staat',
'Class:ActionEmail/Attribute:from' => 'Van',
'Class:ActionEmail/Attribute:from' => 'Van (e-mail)',
'Class:ActionEmail/Attribute:from+' => 'Wordt gebruikt in de hoofdtekst van de e-mail (headers)',
'Class:ActionEmail/Attribute:reply_to' => 'Antwoord',
'Class:ActionEmail/Attribute:from_label' => 'Van (label)',
'Class:ActionEmail/Attribute:from_label+' => 'Wordt gebruikt in de hoofdtekst van de e-mail (headers)',
'Class:ActionEmail/Attribute:reply_to' => 'Antwoord (e-mail)',
'Class:ActionEmail/Attribute:reply_to+' => 'Wordt gebruikt in de hoofdtekst van de e-mail (headers)',
'Class:ActionEmail/Attribute:reply_to_label' => 'Antwoord (label)',
'Class:ActionEmail/Attribute:reply_to_label+' => 'Wordt gebruikt in de hoofdtekst van de e-mail (headers)',
'Class:ActionEmail/Attribute:to' => 'Aan',
'Class:ActionEmail/Attribute:to+' => 'Bestemming van de e-mail',
'Class:ActionEmail/Attribute:cc' => 'CC',

12
dictionaries/pt_br.dictionary.itop.core.php
View File

@@ -505,10 +505,14 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'Class:ActionEmail+' => '',
'Class:ActionEmail/Attribute:test_recipient' => 'Testar destinatário',
'Class:ActionEmail/Attribute:test_recipient+' => 'Destinatário em caso o estado está definido como "Teste"',
'Class:ActionEmail/Attribute:from' => 'De',
'Class:ActionEmail/Attribute:from+' => 'Será enviado para o cabeçalho de email',
'Class:ActionEmail/Attribute:reply_to' => 'Responder para',
'Class:ActionEmail/Attribute:reply_to+' => 'Será enviado para o cabeçalho de email',
'Class:ActionEmail/Attribute:from' => 'De~~',
'Class:ActionEmail/Attribute:from+' => 'Será enviado para o cabeçalho de email~~',
'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:reply_to' => 'Responder para~~',
'Class:ActionEmail/Attribute:reply_to+' => 'Será enviado para o cabeçalho de email~~',
'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:to' => 'Para',
'Class:ActionEmail/Attribute:to+' => 'Destinatário para o email',
'Class:ActionEmail/Attribute:cc' => 'CC',

12
dictionaries/ru.dictionary.itop.core.php
View File

@@ -492,10 +492,14 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'Class:ActionEmail+' => '',
'Class:ActionEmail/Attribute:test_recipient' => 'Тестовый получатель',
'Class:ActionEmail/Attribute:test_recipient+' => 'Получатель, если уведомление в статусе "Тест"',
'Class:ActionEmail/Attribute:from' => 'От',
'Class:ActionEmail/Attribute:from+' => 'Будет отправлено в заголовке email',
'Class:ActionEmail/Attribute:reply_to' => 'Ответить на',
'Class:ActionEmail/Attribute:reply_to+' => 'Будет отправлено в заголовке email',
'Class:ActionEmail/Attribute:from' => 'От~~',
'Class:ActionEmail/Attribute:from+' => 'Будет отправлено в заголовке email~~',
'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:reply_to' => 'Ответить на~~',
'Class:ActionEmail/Attribute:reply_to+' => 'Будет отправлено в заголовке email~~',
'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:to' => 'Кому',
'Class:ActionEmail/Attribute:to+' => 'Получатель email',
'Class:ActionEmail/Attribute:cc' => 'Копия',

12
dictionaries/sk.dictionary.itop.core.php
View File

@@ -502,10 +502,14 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Class:ActionEmail+' => '',
'Class:ActionEmail/Attribute:test_recipient' => 'Testovací príjemca',
'Class:ActionEmail/Attribute:test_recipient+' => '',
'Class:ActionEmail/Attribute:from' => 'Od',
'Class:ActionEmail/Attribute:from+' => '',
'Class:ActionEmail/Attribute:reply_to' => 'Odpoveď na',
'Class:ActionEmail/Attribute:reply_to+' => '',
'Class:ActionEmail/Attribute:from' => 'Od~~',
'Class:ActionEmail/Attribute:from+' => '~~',
'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:reply_to' => 'Odpoveď na~~',
'Class:ActionEmail/Attribute:reply_to+' => '~~',
'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:to' => 'Komu',
'Class:ActionEmail/Attribute:to+' => '',
'Class:ActionEmail/Attribute:cc' => 'Kópia',

12
dictionaries/tr.dictionary.itop.core.php
View File

@@ -513,10 +513,14 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:ActionEmail+' => '',
'Class:ActionEmail/Attribute:test_recipient' => 'Test alıcısı',
'Class:ActionEmail/Attribute:test_recipient+' => 'Durumu "Test" olması durumundaki alıcı',
'Class:ActionEmail/Attribute:from' => 'Kimden',
'Class:ActionEmail/Attribute:from+' => 'e-posta başlığında gönderilecek',
'Class:ActionEmail/Attribute:reply_to' => 'Yanıtla',
'Class:ActionEmail/Attribute:reply_to+' => 'e-posta başlığında gönderilecek',
'Class:ActionEmail/Attribute:from' => 'Kimden~~',
'Class:ActionEmail/Attribute:from+' => 'e-posta başlığında gönderilecek~~',
'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:reply_to' => 'Yanıtla~~',
'Class:ActionEmail/Attribute:reply_to+' => 'e-posta başlığında gönderilecek~~',
'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:to' => 'Kime',
'Class:ActionEmail/Attribute:to+' => 'E-posta alıcısı',
'Class:ActionEmail/Attribute:cc' => 'Kopya',

12
dictionaries/zh_cn.dictionary.itop.core.php
View File

@@ -504,10 +504,14 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Class:ActionEmail+' => '',
'Class:ActionEmail/Attribute:test_recipient' => '测试收件人',
'Class:ActionEmail/Attribute:test_recipient+' => 'Detination in case status is set to "Test"',
'Class:ActionEmail/Attribute:from' => '发件人',
'Class:ActionEmail/Attribute:from+' => 'Will be sent into the email header',
'Class:ActionEmail/Attribute:reply_to' => '回复到',
'Class:ActionEmail/Attribute:reply_to+' => 'Will be sent into the email header',
'Class:ActionEmail/Attribute:from' => '发件人~~',
'Class:ActionEmail/Attribute:from+' => 'Will be sent into the email header~~',
'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:reply_to' => '回复到~~',
'Class:ActionEmail/Attribute:reply_to+' => 'Will be sent into the email header~~',
'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:to' => '收件人',
'Class:ActionEmail/Attribute:to+' => 'Destination of the email',
'Class:ActionEmail/Attribute:cc' => '抄送',