diff --git a/dictionaries/en.dictionary.itop.core.php b/dictionaries/en.dictionary.itop.core.php index 23866d968..1050edb4d 100644 --- a/dictionaries/en.dictionary.itop.core.php +++ b/dictionaries/en.dictionary.itop.core.php @@ -601,7 +601,7 @@ While editing, click on the magnifier to get pertinent examples', '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()$ hyperlink in the backoffice 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, @@ -643,14 +643,21 @@ Dict::Add('EN US', 'English', 'English', array( 'ActionNewsroom:settings' => 'Settings', 'Class:ActionNewsroom' => 'Notification by Newsroom', 'Class:ActionNewsroom+' => '', - 'Class:ActionNewsroom/Attribute:language' => 'Language', - 'Class:ActionNewsroom/Attribute:language+' => '', 'Class:ActionNewsroom/Attribute:title' => 'Title', - 'Class:ActionNewsroom/Attribute:title+' => '', + 'Class:ActionNewsroom/Attribute:title+' => 'Title of the news. Can contain placeholders like $this->attribute_code$', 'Class:ActionNewsroom/Attribute:message' => 'Message', - 'Class:ActionNewsroom/Attribute:message+' => '', + 'Class:ActionNewsroom/Attribute:message+' => 'Contents of the news, in Markdown format not HTML. Can contain placeholders like: +- $this->attribute_code$ any attribute of the object triggering the notification, +- $this->hyperlink()$ hyperlink in the backoffice to the object triggering the notification, +- $this->hyperlink(portal)$ hyperlink in the portal to the object triggering the notification, +- $this->attribute_external_key->attribute$ recursive syntax for any remote attribute, +- $current_contact->attribute$ attribute of the Person who triggered the notification', 'Class:ActionNewsroom/Attribute:icon' => 'Icon', - 'Class:ActionNewsroom/Attribute:icon+' => '', + 'Class:ActionNewsroom/Attribute:icon+' => 'Icon to appear next to the news in the newsroom. +- If filled, the custom icon will be used +- Otherwise, if the triggering object has an icon (e.g. picture of a Person object), it will be used +- Otherwise, if the triggering object has a class icon defined in the datamodel, it will be used +- Otherwise, the application compact logo will be used', 'Class:ActionNewsroom/Attribute:priority' => 'Priority', 'Class:ActionNewsroom/Attribute:priority+' => '', 'Class:ActionNewsroom/Attribute:priority/Value:1' => 'Critical', @@ -664,9 +671,9 @@ Dict::Add('EN US', 'English', 'English', array( 'Class:ActionNewsroom/Attribute:test_recipient_id' => 'Test recipient', 'Class:ActionNewsroom/Attribute:test_recipient_id+' => 'Person used instead of Recipients when notification is being tested', 'Class:ActionNewsroom/Attribute:recipients' => 'Recipients', - 'Class:ActionNewsroom/Attribute:recipients+' => '', + 'Class:ActionNewsroom/Attribute:recipients+' => 'An OQL query returning Contact objects', 'Class:ActionNewsroom/Attribute:url' => 'URL', - 'Class:ActionNewsroom/Attribute:url+' => '', + 'Class:ActionNewsroom/Attribute:url+' => 'If empty, the URL will point to the object triggering the notification. But you can also specify a custom URL.', )); // diff --git a/dictionaries/fr.dictionary.itop.core.php b/dictionaries/fr.dictionary.itop.core.php index 6185e1ba8..9d774a737 100644 --- a/dictionaries/fr.dictionary.itop.core.php +++ b/dictionaries/fr.dictionary.itop.core.php @@ -127,10 +127,21 @@ Si ce champ n\'est pas rempli, la valeur de \'De (libellé)\' sera utilisée', En édition, cliquez sur la loupe pour obtenir des exemples pertinents.', 'Class:ActionNewsroom' => 'Notification par news', 'Class:ActionNewsroom+' => '', - 'Class:ActionNewsroom/Attribute:icon' => 'Icône', - 'Class:ActionNewsroom/Attribute:icon+' => '', + 'Class:ActionNewsroom/Attribute:title' => 'Titre', + 'Class:ActionNewsroom/Attribute:title+' => 'Titre de la news. Peut contenir des mots-clés comme $this->attribute_code$', 'Class:ActionNewsroom/Attribute:message' => 'Message', - 'Class:ActionNewsroom/Attribute:message+' => '', + 'Class:ActionNewsroom/Attribute:message+' => 'Contenu de la news, au format Markdown et non HTML. Peut contenir des mots-clés comme : +- $this->attribute_code$ n\'importe quel attribut de l\'objet déclenchant la notification, +- $this->hyperlink()$ hyperlien vers la console sur l\'objet déclenchant la notification, +- $this->hyperlink(portal)$ hyperlien vers le portail sur l\'objet déclenchant la notification, +- $this->attribute_external_key->attribute$ syntaxe récursive pour n\'importe quel attribut distant, +- $current_contact->attribute$ attribut de la Personne ayant déclenchée la notification', + 'Class:ActionNewsroom/Attribute:icon' => 'Icône', + 'Class:ActionNewsroom/Attribute:icon+' => 'Icône qui apparaitra à côté de la news dans la newsroom. +- Si une icône spécifique est chargée, elle sera utilisée +- Sinon, si l\'objet déclencheur a une icône (ex : la photo d\'un objet Personne), elle sera utilisée +- Sinon, si l\'objet déclencheur a une icône de classe définie dans le datamodel, elle sera utilisée +- Sinon, le logo compact de l\'application sera utilisé', 'Class:ActionNewsroom/Attribute:priority' => 'Priorité', 'Class:ActionNewsroom/Attribute:priority+' => '', 'Class:ActionNewsroom/Attribute:priority/Value:1' => 'Critique', @@ -142,13 +153,11 @@ En édition, cliquez sur la loupe pour obtenir des exemples pertinents.', 'Class:ActionNewsroom/Attribute:priority/Value:4' => 'Standard', 'Class:ActionNewsroom/Attribute:priority/Value:4+' => 'Standard', 'Class:ActionNewsroom/Attribute:recipients' => 'Destinataires', - 'Class:ActionNewsroom/Attribute:recipients+' => '', + 'Class:ActionNewsroom/Attribute:recipients+' => 'Une requête OQL retournant les des objets de type Contact', 'Class:ActionNewsroom/Attribute:test_recipient_id' => 'Destinataire de test', 'Class:ActionNewsroom/Attribute:test_recipient_id+' => 'Personne utilisée en remplacement des Destinataires, lorsque la notification est \'En test\'', - 'Class:ActionNewsroom/Attribute:title' => 'Titre', - 'Class:ActionNewsroom/Attribute:title+' => '', 'Class:ActionNewsroom/Attribute:url' => 'URL', - 'Class:ActionNewsroom/Attribute:url+' => '', + 'Class:ActionNewsroom/Attribute:url+' => 'Si vide, l\'URL pointera vers l\'objet ayant déclenché la notification. Mais vous pouvez également spécifier une URL personnalisée.', 'Class:ActionNotification' => 'Action de notification', 'Class:ActionNotification+' => '', 'Class:AsyncSendEmail' => 'Envoi d\'Email Asynchrone',