From 951ba33bd02158f87cb229b22625194ef0fa8541 Mon Sep 17 00:00:00 2001 From: v-dumas Date: Thu, 13 Nov 2025 10:25:15 +0100 Subject: [PATCH 1/2] =?UTF-8?q?N=C2=B08768=20-=20Fix=20deletion=20of=20Per?= =?UTF-8?q?son=20notified?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/datamodel.core.xml | 52 +++++++++++++++------ dictionaries/cs.dictionary.itop.core.php | 25 +++++++++- dictionaries/da.dictionary.itop.core.php | 23 ++++++++- dictionaries/en.dictionary.itop.core.php | 19 +++++++- dictionaries/en_gb.dictionary.itop.core.php | 19 +++++++- dictionaries/es_cr.dictionary.itop.core.php | 25 +++++++++- dictionaries/fr.dictionary.itop.core.php | 19 +++++++- dictionaries/hu.dictionary.itop.core.php | 23 ++++++++- dictionaries/it.dictionary.itop.core.php | 41 ++++++++++++---- dictionaries/ja.dictionary.itop.core.php | 23 ++++++++- dictionaries/nl.dictionary.itop.core.php | 25 +++++++++- dictionaries/pl.dictionary.itop.core.php | 25 +++++++++- dictionaries/ru.dictionary.itop.core.php | 23 ++++++++- dictionaries/tr.dictionary.itop.core.php | 23 ++++++++- dictionaries/zh_cn.dictionary.itop.core.php | 17 +++++++ 15 files changed, 343 insertions(+), 39 deletions(-) diff --git a/core/datamodel.core.xml b/core/datamodel.core.xml index a06c92cc24..c51d3bb9bb 100644 --- a/core/datamodel.core.xml +++ b/core/datamodel.core.xml @@ -2,9 +2,10 @@ - cmdbAbstractObject + DBObject - core/cmdb,application + 1 + core/cmdb,view_in_gui false autoincrement priv_lnk_action_notif_to_contact @@ -42,18 +43,21 @@ ActionNotification false + DEL_AUTO contact_id Contact false + DEL_AUTO trigger_id Trigger false + DEL_AUTO subscribed @@ -66,18 +70,17 @@ - - - - 10 - - - 20 - - - 30 - - + + 10 + + + 20 + + + 30 + + + 40 @@ -91,11 +94,30 @@ 20 - + 30 + + 40 + + + + + 10 + + + 20 + + + 30 + + + 40 + + + diff --git a/dictionaries/cs.dictionary.itop.core.php b/dictionaries/cs.dictionary.itop.core.php index 72f337c589..a830aedc98 100755 --- a/dictionaries/cs.dictionary.itop.core.php +++ b/dictionaries/cs.dictionary.itop.core.php @@ -501,8 +501,25 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [ 'Class:ActionNotification' => 'Upozornění', 'Class:ActionNotification+' => 'Upozornění (abstraktní)', - 'Class:ActionNotification/Attribute:language' => 'Language~~', - 'Class:ActionNotification/Attribute:language+' => '~~', + 'Class:ActionNotification/Attribute:language' => 'Jazyk', + 'Class:ActionNotification/Attribute:language+' => 'Jazyk použitý pro zástupné znaky ($xxx$) uvnitř zprávy (stav, důležitost, priorita atd.)', +]); + +// +// Class: lnkActionNotificationToContact +// + +Dict::Add('CS CZ', 'Czech', 'Čeština', [ + 'Class:lnkActionNotificationToContact' => 'Link ActionNotification / Contact~~', + 'Class:lnkActionNotificationToContact+' => 'Contact subscription to Notification Action~~', + 'Class:lnkActionNotificationToContact/Attribute:contact_id' => 'Contact~~', + 'Class:lnkActionNotificationToContact/Attribute:contact_id+' => 'Contact who subscribed (or not) to the notification~~', + 'Class:lnkActionNotificationToContact/Attribute:action_id' => 'Action~~', + 'Class:lnkActionNotificationToContact/Attribute:action_id+' => 'The notification that the contact received at least once, and to which he can subscribe or unsubscribe~~', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id' => 'Trigger~~', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id+' => 'The trigger that fired the notification~~', + 'Class:lnkActionNotificationToContact/Attribute:subscribed' => 'Subscribed~~', + 'Class:lnkActionNotificationToContact/Attribute:subscribed+' => 'If the contact unsubscribed (no) or is subscribed (yes and default) to the notification~~', ]); // @@ -1201,4 +1218,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [ 'Class:ResourceSystemMenu' => 'Resource System Menu~~', 'Class:ResourceSystemMenu+' => '', + 'Class:EventNotification/Attribute:object_class' => 'Object class~~', + 'Class:EventNotification/Attribute:object_class+' => 'Object class (Same as trigger)~~', + 'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent~~', + 'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification~~', ]); diff --git a/dictionaries/da.dictionary.itop.core.php b/dictionaries/da.dictionary.itop.core.php index 2f2f8afae4..8b47ab2440 100644 --- a/dictionaries/da.dictionary.itop.core.php +++ b/dictionaries/da.dictionary.itop.core.php @@ -501,7 +501,24 @@ 'Class:ActionNotification' => 'Notifikation', 'Class:ActionNotification+' => '', 'Class:ActionNotification/Attribute:language' => 'Language~~', - 'Class:ActionNotification/Attribute:language+' => '~~', + 'Class:ActionNotification/Attribute:language+' => 'Language to use for placeholders ($xxx$) inside the message (state, importance, priority, etc)~~', +]); + +// +// Class: lnkActionNotificationToContact +// + +Dict::Add('DA DA', 'Danish', 'Dansk', [ + 'Class:lnkActionNotificationToContact' => 'Link ActionNotification / Contact~~', + 'Class:lnkActionNotificationToContact+' => 'Contact subscription to Notification Action~~', + 'Class:lnkActionNotificationToContact/Attribute:contact_id' => 'Contact~~', + 'Class:lnkActionNotificationToContact/Attribute:contact_id+' => 'Contact who subscribed (or not) to the notification~~', + 'Class:lnkActionNotificationToContact/Attribute:action_id' => 'Action~~', + 'Class:lnkActionNotificationToContact/Attribute:action_id+' => 'The notification that the contact received at least once, and to which he can subscribe or unsubscribe~~', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id' => 'Trigger~~', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id+' => 'The trigger that fired the notification~~', + 'Class:lnkActionNotificationToContact/Attribute:subscribed' => 'Subscribed~~', + 'Class:lnkActionNotificationToContact/Attribute:subscribed+' => 'If the contact unsubscribed (no) or is subscribed (yes and default) to the notification~~', ]); // @@ -1200,4 +1217,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [ 'Class:ResourceSystemMenu' => 'Resource System Menu~~', 'Class:ResourceSystemMenu+' => '', + 'Class:EventNotification/Attribute:object_class' => 'Object class~~', + 'Class:EventNotification/Attribute:object_class+' => 'Object class (Same as trigger)~~', + 'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent~~', + 'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification~~', ]); diff --git a/dictionaries/en.dictionary.itop.core.php b/dictionaries/en.dictionary.itop.core.php index 8c805c81b2..95858a29fa 100644 --- a/dictionaries/en.dictionary.itop.core.php +++ b/dictionaries/en.dictionary.itop.core.php @@ -558,7 +558,24 @@ 'Class:ActionNotification' => 'Notification Action', 'Class:ActionNotification+' => 'Notification Action (abstract)', 'Class:ActionNotification/Attribute:language' => 'Language', - 'Class:ActionNotification/Attribute:language+' => '', + 'Class:ActionNotification/Attribute:language+' => 'Language to use for placeholders ($xxx$) inside the message (state, importance, priority, etc)', +]); + +// +// Class: lnkActionNotificationToContact +// + +Dict::Add('EN US', 'English', 'English', [ + 'Class:lnkActionNotificationToContact' => 'Link ActionNotification / Contact', + 'Class:lnkActionNotificationToContact+' => 'Contact subscription to Notification Action', + 'Class:lnkActionNotificationToContact/Attribute:contact_id' => 'Contact', + 'Class:lnkActionNotificationToContact/Attribute:contact_id+' => 'Contact who subscribed (or not) to the notification', + 'Class:lnkActionNotificationToContact/Attribute:action_id' => 'Action', + 'Class:lnkActionNotificationToContact/Attribute:action_id+' => 'The notification that the contact received at least once, and to which he can subscribe or unsubscribe', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id' => 'Trigger', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id+' => 'The trigger that fired the notification', + 'Class:lnkActionNotificationToContact/Attribute:subscribed' => 'Subscribed', + 'Class:lnkActionNotificationToContact/Attribute:subscribed+' => 'If the contact unsubscribed (no) or is subscribed (yes and default) to the notification', ]); // diff --git a/dictionaries/en_gb.dictionary.itop.core.php b/dictionaries/en_gb.dictionary.itop.core.php index e02fa63523..330ed07444 100644 --- a/dictionaries/en_gb.dictionary.itop.core.php +++ b/dictionaries/en_gb.dictionary.itop.core.php @@ -545,7 +545,24 @@ 'Class:ActionNotification' => 'Notification Action', 'Class:ActionNotification+' => 'Notification Action (abstract)', 'Class:ActionNotification/Attribute:language' => 'Language', - 'Class:ActionNotification/Attribute:language+' => '', + 'Class:ActionNotification/Attribute:language+' => 'Language to use for placeholders ($xxx$) inside the message (state, importance, priority, etc)', +]); + +// +// Class: lnkActionNotificationToContact +// + +Dict::Add('EN GB', 'British English', 'British English', [ + 'Class:lnkActionNotificationToContact' => 'Link ActionNotification / Contact', + 'Class:lnkActionNotificationToContact+' => 'Contact subscription to Notification Action', + 'Class:lnkActionNotificationToContact/Attribute:contact_id' => 'Contact', + 'Class:lnkActionNotificationToContact/Attribute:contact_id+' => 'Contact who subscribed (or not) to the notification', + 'Class:lnkActionNotificationToContact/Attribute:action_id' => 'Action', + 'Class:lnkActionNotificationToContact/Attribute:action_id+' => 'The notification that the contact received at least once, and to which he can subscribe or unsubscribe', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id' => 'Trigger', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id+' => 'The trigger that fired the notification', + 'Class:lnkActionNotificationToContact/Attribute:subscribed' => 'Subscribed', + 'Class:lnkActionNotificationToContact/Attribute:subscribed+' => 'If the contact unsubscribed (no) or is subscribed (yes and default) to the notification', ]); // diff --git a/dictionaries/es_cr.dictionary.itop.core.php b/dictionaries/es_cr.dictionary.itop.core.php index eb78a57bbf..af5aeaf5dc 100644 --- a/dictionaries/es_cr.dictionary.itop.core.php +++ b/dictionaries/es_cr.dictionary.itop.core.php @@ -497,8 +497,25 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [ 'Class:ActionNotification' => 'Notificación', 'Class:ActionNotification+' => 'Notificación (resúmen)', - 'Class:ActionNotification/Attribute:language' => 'Language~~', - 'Class:ActionNotification/Attribute:language+' => '~~', + 'Class:ActionNotification/Attribute:language' => 'Idioma', + 'Class:ActionNotification/Attribute:language+' => 'Idioma a utilizar para los marcadores de posición ($xxx$) dentro del mensaje (estado, importancia, prioridad, etc.)', +]); + +// +// Class: lnkActionNotificationToContact +// + +Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [ + 'Class:lnkActionNotificationToContact' => 'Link ActionNotification / Contact~~', + 'Class:lnkActionNotificationToContact+' => 'Contact subscription to Notification Action~~', + 'Class:lnkActionNotificationToContact/Attribute:contact_id' => 'Contact~~', + 'Class:lnkActionNotificationToContact/Attribute:contact_id+' => 'Contact who subscribed (or not) to the notification~~', + 'Class:lnkActionNotificationToContact/Attribute:action_id' => 'Action~~', + 'Class:lnkActionNotificationToContact/Attribute:action_id+' => 'The notification that the contact received at least once, and to which he can subscribe or unsubscribe~~', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id' => 'Trigger~~', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id+' => 'The trigger that fired the notification~~', + 'Class:lnkActionNotificationToContact/Attribute:subscribed' => 'Subscribed~~', + 'Class:lnkActionNotificationToContact/Attribute:subscribed+' => 'If the contact unsubscribed (no) or is subscribed (yes and default) to the notification~~', ]); // @@ -1188,4 +1205,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [ 'Class:ResourceSystemMenu' => 'Recurso Menú de Sistema', 'Class:ResourceSystemMenu+' => '', + 'Class:EventNotification/Attribute:object_class' => 'Object class~~', + 'Class:EventNotification/Attribute:object_class+' => 'Object class (Same as trigger)~~', + 'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent~~', + 'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification~~', ]); diff --git a/dictionaries/fr.dictionary.itop.core.php b/dictionaries/fr.dictionary.itop.core.php index 951c188882..9546b7920b 100644 --- a/dictionaries/fr.dictionary.itop.core.php +++ b/dictionaries/fr.dictionary.itop.core.php @@ -503,7 +503,24 @@ 'Class:ActionNotification' => 'Action de notification', 'Class:ActionNotification+' => '', 'Class:ActionNotification/Attribute:language' => 'Langue', - 'Class:ActionNotification/Attribute:language+' => '', + 'Class:ActionNotification/Attribute:language+' => 'Langue utilisée pour les placeholders ($xxx$) dans le message (statut, importance, priorité, etc)', +]); + +// +// Class: lnkActionNotificationToContact +// + +Dict::Add('FR FR', 'French', 'Français', [ + 'Class:lnkActionNotificationToContact' => 'Lien Action de Notification / Contact', + 'Class:lnkActionNotificationToContact+' => 'Abonnement des contacts aux notifications', + 'Class:lnkActionNotificationToContact/Attribute:contact_id' => 'Contact', + 'Class:lnkActionNotificationToContact/Attribute:contact_id+' => 'Contact abonné à la notification', + 'Class:lnkActionNotificationToContact/Attribute:action_id' => 'Action', + 'Class:lnkActionNotificationToContact/Attribute:action_id+' => 'La notification à laquelle le contact est abonné', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id' => 'Déclencheur', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id+' => 'Le déclencheur à l\'origine de cette notification', + 'Class:lnkActionNotificationToContact/Attribute:subscribed' => 'Abonné', + 'Class:lnkActionNotificationToContact/Attribute:subscribed+' => 'Si le contact est abonné ou non à cette notification', ]); // diff --git a/dictionaries/hu.dictionary.itop.core.php b/dictionaries/hu.dictionary.itop.core.php index 60712e4a15..a104072375 100755 --- a/dictionaries/hu.dictionary.itop.core.php +++ b/dictionaries/hu.dictionary.itop.core.php @@ -500,7 +500,24 @@ 'Class:ActionNotification' => 'Értesítés', 'Class:ActionNotification+' => 'Értesítés (absztrakt)', 'Class:ActionNotification/Attribute:language' => 'Language~~', - 'Class:ActionNotification/Attribute:language+' => '~~', + 'Class:ActionNotification/Attribute:language+' => 'Language to use for placeholders ($xxx$) inside the message (state, importance, priority, etc)~~', +]); + +// +// Class: lnkActionNotificationToContact +// + +Dict::Add('HU HU', 'Hungarian', 'Magyar', [ + 'Class:lnkActionNotificationToContact' => 'Link ActionNotification / Contact~~', + 'Class:lnkActionNotificationToContact+' => 'Contact subscription to Notification Action~~', + 'Class:lnkActionNotificationToContact/Attribute:contact_id' => 'Contact~~', + 'Class:lnkActionNotificationToContact/Attribute:contact_id+' => 'Contact who subscribed (or not) to the notification~~', + 'Class:lnkActionNotificationToContact/Attribute:action_id' => 'Action~~', + 'Class:lnkActionNotificationToContact/Attribute:action_id+' => 'The notification that the contact received at least once, and to which he can subscribe or unsubscribe~~', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id' => 'Trigger~~', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id+' => 'The trigger that fired the notification~~', + 'Class:lnkActionNotificationToContact/Attribute:subscribed' => 'Subscribed~~', + 'Class:lnkActionNotificationToContact/Attribute:subscribed+' => 'If the contact unsubscribed (no) or is subscribed (yes and default) to the notification~~', ]); // @@ -1195,4 +1212,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [ 'Class:ResourceSystemMenu' => 'Erőforrás rendszer menü', 'Class:ResourceSystemMenu+' => '', + 'Class:EventNotification/Attribute:object_class' => 'Object class~~', + 'Class:EventNotification/Attribute:object_class+' => 'Object class (Same as trigger)~~', + 'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent~~', + 'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification~~', ]); diff --git a/dictionaries/it.dictionary.itop.core.php b/dictionaries/it.dictionary.itop.core.php index ff3aba81e5..cce215b7b5 100644 --- a/dictionaries/it.dictionary.itop.core.php +++ b/dictionaries/it.dictionary.itop.core.php @@ -499,8 +499,26 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [ 'Class:ActionNotification' => 'Notifica', 'Class:ActionNotification+' => 'Notifica (sommario)', - 'Class:ActionNotification/Attribute:language' => 'Language~~', - 'Class:ActionNotification/Attribute:language+' => '~~', + 'Class:ActionNotification/Attribute:language' => 'Lingua', + 'Class:ActionNotification/Attribute:language+' => 'Lingua da utilizzare per i segnaposto ($xxx$) all\'interno del messaggio (stato, importanza, priorità, ecc.)', +]); + + +// +// Class: lnkActionNotificationToContact +// + +Dict::Add('IT IT', 'Italian', 'Italiano', [ + 'Class:lnkActionNotificationToContact' => 'Link ActionNotification / Contact~~', + 'Class:lnkActionNotificationToContact+' => 'Contact subscription to Notification Action~~', + 'Class:lnkActionNotificationToContact/Attribute:contact_id' => 'Contact~~', + 'Class:lnkActionNotificationToContact/Attribute:contact_id+' => 'Contact who subscribed (or not) to the notification~~', + 'Class:lnkActionNotificationToContact/Attribute:action_id' => 'Action~~', + 'Class:lnkActionNotificationToContact/Attribute:action_id+' => 'The notification that the contact received at least once, and to which he can subscribe or unsubscribe~~', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id' => 'Trigger~~', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id+' => 'The trigger that fired the notification~~', + 'Class:lnkActionNotificationToContact/Attribute:subscribed' => 'Subscribed~~', + 'Class:lnkActionNotificationToContact/Attribute:subscribed+' => 'If the contact unsubscribed (no) or is subscribed (yes and default) to the notification~~', ]); // @@ -772,15 +790,18 @@ 'Class:SynchroDataSource/Attribute:description' => 'Descrizione', 'Class:SynchroDataSource/Attribute:status' => 'Stato', 'Class:SynchroDataSource/Attribute:scope_class' => 'Classe bersaglio', - 'Class:SynchroDataSource/Attribute:scope_class+' => 'Una Fonte dati di sincronizzazione può popolare solo una singola classe '.ITOP_APPLICATION_SHORT, 'Class:SynchroDataSource/Attribute:user_id' => 'Utente', + 'Class:SynchroDataSource/Attribute:scope_class+' => 'Una fonte dati di sincronizzazione può popolare solo una singola classe '.ITOP_APPLICATION_SHORT, + 'Class:SynchroDataSource/Attribute:user_id' => 'Utente', 'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Contatto a cui notificare', 'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contatto a cui notificare in caso di errore ', 'Class:SynchroDataSource/Attribute:url_icon' => 'Icona del collegamento ipertestuale', - 'Class:SynchroDataSource/Attribute:url_icon+' => 'Una (piccola) immagine del collegamento ipertestuale che rappresenta l\'applicazione con cui è sincronizzato '.ITOP_APPLICATION_SHORT, 'Class:SynchroDataSource/Attribute:url_application' => 'Collegamento ipertestuale all\'applicazione', + 'Class:SynchroDataSource/Attribute:url_icon+' => 'Una (piccola) immagine del collegamento ipertestuale che rappresenta l\'applicazione con cui è sincronizzato '.ITOP_APPLICATION_SHORT, + 'Class:SynchroDataSource/Attribute:url_application' => 'Collegamento ipertestuale all\'applicazione', 'Class:SynchroDataSource/Attribute:url_application+' => 'Collegamento ipertestuale all\'oggetto ITOP nell\'applicazione esterna con la quale QiTop è sincronizzato (se applicabile). Possibili segnaposto: $this->attribute$ e $replica->primary_key$', 'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Policy di riconciliazione', 'Class:SynchroDataSource/Attribute:reconciliation_policy+' => '"Utilizza gli attributi": L\'oggetto '.ITOP_APPLICATION_SHORT.' corrisponde ai valori replica per ciascun attributo di sincronizzazione contrassegnato per la Conciliazione. - "Utilizza la chiave primaria": si prevede che la colonna primary_key della replica contenga l\'identificatore dell\'oggetto '.ITOP_APPLICATION_SHORT, 'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Intervallo di pieno carico', + "Utilizza la chiave primaria": si prevede che la colonna primary_key della replica contenga l\'identificatore dell\'oggetto '.ITOP_APPLICATION_SHORT, + 'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Intervallo di pieno carico', 'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'Una ricarica completa di tutti i dati deve verificarsi almeno come specificato qui', 'Class:SynchroDataSource/Attribute:action_on_zero' => 'Azione su zero', 'Class:SynchroDataSource/Attribute:action_on_zero+' => 'Azione da eseguire quando la ricerca non restituisce alcun oggetto', @@ -817,11 +838,11 @@ "Ignora": Non fare nulla, l\'oggetto associato rimane invariato in iTop. "Cancella": Cancella l\'oggetto associato in iTop (e la replica nella tabella dei dati). "Aggiorna": Aggiorna l\'oggetto associato come specificato dalle regole di aggiornamento (vedi sotto). - "Aggiorna e cancella": applica le "Regole di aggiornamento". Quando scade la Durata di conservazione, esegui una "Cancellazione ', + "Aggiorna e cancella": applica le "Regole di aggiornamento". Quando scade la durata di conservazione, esegui una "Cancellazione ', 'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Cancella', 'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignora', 'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Aggiorna', - 'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Aggiorna e poi Cancella', + 'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Aggiorna e poi cancella', 'Class:SynchroDataSource/Attribute:attribute_list' => 'Lista degli attributi', 'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Solo Amministratore', 'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Tutti sono autorizzati a cancellare gli oggetti', @@ -897,7 +918,7 @@ 'TitleSynchroExecution' => 'Esecuzione della sincronizzazione', 'Class:SynchroDataSource:DataTable' => 'Tabella del database: %1$s', 'Core:SyncDataSourceObsolete' => 'La fonte dei dati è contrassegnata come obsoleta. Operazione annullata', - 'Core:SyncDataSourceAccessRestriction' => 'Solo amministratori o l\'utente specificato nella fonte dei dati può eseguire questa operazione. Operazione annullata', + 'Core:SyncDataSourceAccessRestriction' => 'Solo gli amministratori o l\'utente specificato nella fonte dei dati possono eseguire questa operazione. Operazione annullata', 'Core:SyncTooManyMissingReplicas' => 'Tutte le repliche sono mancanti dall\'importazione. Hai eseguito realmente l\'importazione? Operazione annullata', 'Core:SyncSplitModeCLIOnly' => 'La sincronizzazione può essere eseguita in blocchi solo se eseguito in modalità CLI', 'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s repliche, %2$s errore(i), %3$s warning(s).', @@ -1192,4 +1213,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [ 'Class:ResourceSystemMenu' => 'Menu di Sistema delle Risorse', 'Class:ResourceSystemMenu+' => '', + 'Class:EventNotification/Attribute:object_class' => 'Object class~~', + 'Class:EventNotification/Attribute:object_class+' => 'Object class (Same as trigger)~~', + 'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent~~', + 'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification~~', ]); diff --git a/dictionaries/ja.dictionary.itop.core.php b/dictionaries/ja.dictionary.itop.core.php index eb7f4780c2..9c293a0383 100644 --- a/dictionaries/ja.dictionary.itop.core.php +++ b/dictionaries/ja.dictionary.itop.core.php @@ -500,7 +500,24 @@ 'Class:ActionNotification' => '通知', 'Class:ActionNotification+' => '通知(要約)', 'Class:ActionNotification/Attribute:language' => 'Language~~', - 'Class:ActionNotification/Attribute:language+' => '~~', + 'Class:ActionNotification/Attribute:language+' => 'Language to use for placeholders ($xxx$) inside the message (state, importance, priority, etc)~~', +]); + +// +// Class: lnkActionNotificationToContact +// + +Dict::Add('JA JP', 'Japanese', '日本語', [ + 'Class:lnkActionNotificationToContact' => 'Link ActionNotification / Contact~~', + 'Class:lnkActionNotificationToContact+' => 'Contact subscription to Notification Action~~', + 'Class:lnkActionNotificationToContact/Attribute:contact_id' => 'Contact~~', + 'Class:lnkActionNotificationToContact/Attribute:contact_id+' => 'Contact who subscribed (or not) to the notification~~', + 'Class:lnkActionNotificationToContact/Attribute:action_id' => 'Action~~', + 'Class:lnkActionNotificationToContact/Attribute:action_id+' => 'The notification that the contact received at least once, and to which he can subscribe or unsubscribe~~', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id' => 'Trigger~~', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id+' => 'The trigger that fired the notification~~', + 'Class:lnkActionNotificationToContact/Attribute:subscribed' => 'Subscribed~~', + 'Class:lnkActionNotificationToContact/Attribute:subscribed+' => 'If the contact unsubscribed (no) or is subscribed (yes and default) to the notification~~', ]); // @@ -1199,4 +1216,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', [ 'Class:ResourceSystemMenu' => 'Resource System Menu~~', 'Class:ResourceSystemMenu+' => '~~', + 'Class:EventNotification/Attribute:object_class' => 'Object class~~', + 'Class:EventNotification/Attribute:object_class+' => 'Object class (Same as trigger)~~', + 'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent~~', + 'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification~~', ]); diff --git a/dictionaries/nl.dictionary.itop.core.php b/dictionaries/nl.dictionary.itop.core.php index e95bd1e7a6..4e6398e89f 100644 --- a/dictionaries/nl.dictionary.itop.core.php +++ b/dictionaries/nl.dictionary.itop.core.php @@ -501,8 +501,25 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [ 'Class:ActionNotification' => 'Melding', 'Class:ActionNotification+' => 'Melding (abstract)', - 'Class:ActionNotification/Attribute:language' => 'Language~~', - 'Class:ActionNotification/Attribute:language+' => '~~', + 'Class:ActionEmail/Attribute:language' => 'Language~~', + 'Class:ActionEmail/Attribute:language+' => 'Language to use for placeholders ($xxx$) inside the message (state, importance, priority, etc)~~', +]); + +// +// Class: lnkActionNotificationToContact +// + +Dict::Add('NL NL', 'Dutch', 'Nederlands', [ + 'Class:lnkActionNotificationToContact' => 'Link ActionNotification / Contact~~', + 'Class:lnkActionNotificationToContact+' => 'Contact subscription to Notification Action~~', + 'Class:lnkActionNotificationToContact/Attribute:contact_id' => 'Contact~~', + 'Class:lnkActionNotificationToContact/Attribute:contact_id+' => 'Contact who subscribed (or not) to the notification~~', + 'Class:lnkActionNotificationToContact/Attribute:action_id' => 'Action~~', + 'Class:lnkActionNotificationToContact/Attribute:action_id+' => 'The notification that the contact received at least once, and to which he can subscribe or unsubscribe~~', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id' => 'Trigger~~', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id+' => 'The trigger that fired the notification~~', + 'Class:lnkActionNotificationToContact/Attribute:subscribed' => 'Subscribed~~', + 'Class:lnkActionNotificationToContact/Attribute:subscribed+' => 'If the contact unsubscribed (no) or is subscribed (yes and default) to the notification~~', ]); // @@ -1197,4 +1214,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [ 'Class:ResourceSystemMenu' => 'Tool "System Menu"', 'Class:ResourceSystemMenu+' => '', + 'Class:EventNotification/Attribute:object_class' => 'Object class~~', + 'Class:EventNotification/Attribute:object_class+' => 'Object class (Same as trigger)~~', + 'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent~~', + 'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification~~', ]); diff --git a/dictionaries/pl.dictionary.itop.core.php b/dictionaries/pl.dictionary.itop.core.php index f1f3c9ecfd..e32e1155aa 100644 --- a/dictionaries/pl.dictionary.itop.core.php +++ b/dictionaries/pl.dictionary.itop.core.php @@ -499,8 +499,25 @@ Dict::Add('PL PL', 'Polish', 'Polski', [ 'Class:ActionNotification' => 'Powiadomienie', 'Class:ActionNotification+' => 'Powiadomienie (abstrakcja)', - 'Class:ActionNotification/Attribute:language' => 'Language~~', - 'Class:ActionNotification/Attribute:language+' => '~~', + 'Class:ActionNotification/Attribute:language' => 'Język', + 'Class:ActionNotification/Attribute:language+' => 'Język używany dla symboli zastępczych ($xxx$) w wiadomości (stan, ważność, priorytet itp.)', +]); + +// +// Class: lnkActionNotificationToContact +// + +Dict::Add('PL PL', 'Polish', 'Polski', [ + 'Class:lnkActionNotificationToContact' => 'Link ActionNotification / Contact~~', + 'Class:lnkActionNotificationToContact+' => 'Contact subscription to Notification Action~~', + 'Class:lnkActionNotificationToContact/Attribute:contact_id' => 'Contact~~', + 'Class:lnkActionNotificationToContact/Attribute:contact_id+' => 'Contact who subscribed (or not) to the notification~~', + 'Class:lnkActionNotificationToContact/Attribute:action_id' => 'Action~~', + 'Class:lnkActionNotificationToContact/Attribute:action_id+' => 'The notification that the contact received at least once, and to which he can subscribe or unsubscribe~~', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id' => 'Trigger~~', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id+' => 'The trigger that fired the notification~~', + 'Class:lnkActionNotificationToContact/Attribute:subscribed' => 'Subscribed~~', + 'Class:lnkActionNotificationToContact/Attribute:subscribed+' => 'If the contact unsubscribed (no) or is subscribed (yes and default) to the notification~~', ]); // @@ -1194,4 +1211,8 @@ Dict::Add('PL PL', 'Polish', 'Polski', [ 'Class:ResourceSystemMenu' => 'Zasób Menu systemowe', 'Class:ResourceSystemMenu+' => '', + 'Class:EventNotification/Attribute:object_class' => 'Object class~~', + 'Class:EventNotification/Attribute:object_class+' => 'Object class (Same as trigger)~~', + 'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent~~', + 'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification~~', ]); diff --git a/dictionaries/ru.dictionary.itop.core.php b/dictionaries/ru.dictionary.itop.core.php index 27026b3d50..c8eb3c4103 100644 --- a/dictionaries/ru.dictionary.itop.core.php +++ b/dictionaries/ru.dictionary.itop.core.php @@ -501,7 +501,24 @@ 'Class:ActionNotification' => 'Уведомление', 'Class:ActionNotification+' => '', 'Class:ActionNotification/Attribute:language' => 'Language~~', - 'Class:ActionNotification/Attribute:language+' => '~~', + 'Class:ActionNotification/Attribute:language+' => 'Language to use for placeholders ($xxx$) inside the message (state, importance, priority, etc)~~', +]); + +// +// Class: lnkActionNotificationToContact +// + +Dict::Add('RU RU', 'Russian', 'Русский', [ + 'Class:lnkActionNotificationToContact' => 'Link ActionNotification / Contact~~', + 'Class:lnkActionNotificationToContact+' => 'Contact subscription to Notification Action~~', + 'Class:lnkActionNotificationToContact/Attribute:contact_id' => 'Contact~~', + 'Class:lnkActionNotificationToContact/Attribute:contact_id+' => 'Contact who subscribed (or not) to the notification~~', + 'Class:lnkActionNotificationToContact/Attribute:action_id' => 'Action~~', + 'Class:lnkActionNotificationToContact/Attribute:action_id+' => 'The notification that the contact received at least once, and to which he can subscribe or unsubscribe~~', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id' => 'Trigger~~', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id+' => 'The trigger that fired the notification~~', + 'Class:lnkActionNotificationToContact/Attribute:subscribed' => 'Subscribed~~', + 'Class:lnkActionNotificationToContact/Attribute:subscribed+' => 'If the contact unsubscribed (no) or is subscribed (yes and default) to the notification~~', ]); // @@ -1200,4 +1217,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', [ 'Class:ResourceSystemMenu' => 'Меню Система', 'Class:ResourceSystemMenu+' => '', + 'Class:EventNotification/Attribute:object_class' => 'Object class~~', + 'Class:EventNotification/Attribute:object_class+' => 'Object class (Same as trigger)~~', + 'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent~~', + 'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification~~', ]); diff --git a/dictionaries/tr.dictionary.itop.core.php b/dictionaries/tr.dictionary.itop.core.php index 660228736a..7ae81638e2 100644 --- a/dictionaries/tr.dictionary.itop.core.php +++ b/dictionaries/tr.dictionary.itop.core.php @@ -501,7 +501,24 @@ 'Class:ActionNotification' => 'Bildirim', 'Class:ActionNotification+' => 'Bildirim (soyut)', 'Class:ActionNotification/Attribute:language' => 'Language~~', - 'Class:ActionNotification/Attribute:language+' => '~~', + 'Class:ActionNotification/Attribute:language+' => 'Language to use for placeholders ($xxx$) inside the message (state, importance, priority, etc)~~', +]); + +// +// Class: lnkActionNotificationToContact +// + +Dict::Add('TR TR', 'Turkish', 'Türkçe', [ + 'Class:lnkActionNotificationToContact' => 'Link ActionNotification / Contact~~', + 'Class:lnkActionNotificationToContact+' => 'Contact subscription to Notification Action~~', + 'Class:lnkActionNotificationToContact/Attribute:contact_id' => 'Contact~~', + 'Class:lnkActionNotificationToContact/Attribute:contact_id+' => 'Contact who subscribed (or not) to the notification~~', + 'Class:lnkActionNotificationToContact/Attribute:action_id' => 'Action~~', + 'Class:lnkActionNotificationToContact/Attribute:action_id+' => 'The notification that the contact received at least once, and to which he can subscribe or unsubscribe~~', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id' => 'Trigger~~', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id+' => 'The trigger that fired the notification~~', + 'Class:lnkActionNotificationToContact/Attribute:subscribed' => 'Subscribed~~', + 'Class:lnkActionNotificationToContact/Attribute:subscribed+' => 'If the contact unsubscribed (no) or is subscribed (yes and default) to the notification~~', ]); // @@ -1200,4 +1217,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [ 'Class:ResourceSystemMenu' => 'Resource System Menu~~', 'Class:ResourceSystemMenu+' => '', + 'Class:EventNotification/Attribute:object_class' => 'Object class~~', + 'Class:EventNotification/Attribute:object_class+' => 'Object class (Same as trigger)~~', + 'Core:EventNotificationNewsroom:ErrorNotificationNotSent' => 'Notification not sent~~', + 'Core:EventNotificationNewsroom:ErrorOnDBInsert' => 'An error occurred while saving the notification~~', ]); diff --git a/dictionaries/zh_cn.dictionary.itop.core.php b/dictionaries/zh_cn.dictionary.itop.core.php index 142948e149..ced119b565 100644 --- a/dictionaries/zh_cn.dictionary.itop.core.php +++ b/dictionaries/zh_cn.dictionary.itop.core.php @@ -505,6 +505,23 @@ 'Class:ActionNotification/Attribute:language+' => '', ]); +// +// Class: lnkActionNotificationToContact +// + +Dict::Add('ZH CN', 'Chinese', '简体中文', [ + 'Class:lnkActionNotificationToContact' => 'Link ActionNotification / Contact~~', + 'Class:lnkActionNotificationToContact+' => 'Contact subscription to Notification Action~~', + 'Class:lnkActionNotificationToContact/Attribute:contact_id' => 'Contact~~', + 'Class:lnkActionNotificationToContact/Attribute:contact_id+' => 'Contact who subscribed (or not) to the notification~~', + 'Class:lnkActionNotificationToContact/Attribute:action_id' => 'Action~~', + 'Class:lnkActionNotificationToContact/Attribute:action_id+' => 'The notification that the contact received at least once, and to which he can subscribe or unsubscribe~~', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id' => 'Trigger~~', + 'Class:lnkActionNotificationToContact/Attribute:trigger_id+' => 'The trigger that fired the notification~~', + 'Class:lnkActionNotificationToContact/Attribute:subscribed' => 'Subscribed~~', + 'Class:lnkActionNotificationToContact/Attribute:subscribed+' => 'If the contact unsubscribed (no) or is subscribed (yes and default) to the notification~~', +]); + // // Class: ActionEmail // From 7a12fef9b3abde66f9d8bfdf361817bdb1128e62 Mon Sep 17 00:00:00 2001 From: v-dumas Date: Thu, 13 Nov 2025 10:57:15 +0100 Subject: [PATCH 2/2] =?UTF-8?q?N=C2=B08768=20-=20Keep=20standard=20Externa?= =?UTF-8?q?lKey=20on=20lnkActionNotificationToContact?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/datamodel.core.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/datamodel.core.xml b/core/datamodel.core.xml index c51d3bb9bb..16b716bdec 100644 --- a/core/datamodel.core.xml +++ b/core/datamodel.core.xml @@ -70,13 +70,13 @@ - + 10 20 - + 30