Bladeren bron

Enhancement: when an (optional) external key cannot be reconciled, log a warning on the replica. the replicas containing a warning are then processed everytime in case the ext key changes
Also improved the search/display of replicas

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@1676 a333f486-631f-4898-b8df-5754b55c2be0

dflaven 13 jaren geleden
bovenliggende
commit
237699161f
2 gewijzigde bestanden met toevoegingen van 8 en 2 verwijderingen
  1. 4 2
      dictionaries/dictionary.itop.core.php
  2. 4 0
      dictionaries/fr.dictionary.itop.core.php

+ 4 - 2
dictionaries/dictionary.itop.core.php

@@ -639,7 +639,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Core:SyncDataSourceObsolete' => 'The data source is marked as obsolete. Operation cancelled.',
 	'Core:SyncDataSourceObsolete' => 'The data source is marked as obsolete. Operation cancelled.',
 	'Core:SyncDataSourceAccessRestriction' => 'Only adminstrators or the user specified in the data source can execute this operation. Operation cancelled.',
 	'Core:SyncDataSourceAccessRestriction' => 'Only adminstrators or the user specified in the data source can execute this operation. Operation cancelled.',
 	'Core:SyncTooManyMissingReplicas' => 'All records have been untouched for some time (all of the objects could be deleted). Please check that the process that writes into the synchronization table is still running. Operation cancelled.',
 	'Core:SyncTooManyMissingReplicas' => 'All records have been untouched for some time (all of the objects could be deleted). Please check that the process that writes into the synchronization table is still running. Operation cancelled.',
-
+	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s error(s), %3$s warning(s).',
+	'Core:SynchroReplica:TargetObject' => 'Synchronized Object: %1$s',
 	'Class:AsyncSendEmail' => 'Email (asynchronous)',
 	'Class:AsyncSendEmail' => 'Email (asynchronous)',
 	'Class:AsyncSendEmail/Attribute:to' => 'To',
 	'Class:AsyncSendEmail/Attribute:to' => 'To',
 	'Class:AsyncSendEmail/Attribute:subject' => 'Subject',
 	'Class:AsyncSendEmail/Attribute:subject' => 'Subject',
@@ -717,7 +718,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:SynchroReplica/Attribute:sync_source_id' => 'Synchro Data Source',
 	'Class:SynchroReplica/Attribute:sync_source_id' => 'Synchro Data Source',
 	'Class:SynchroReplica/Attribute:dest_id' => 'Destination object (ID)',
 	'Class:SynchroReplica/Attribute:dest_id' => 'Destination object (ID)',
 	'Class:SynchroReplica/Attribute:dest_class' => 'Destination type',
 	'Class:SynchroReplica/Attribute:dest_class' => 'Destination type',
-	'Class:SynchroReplica/Attribute:status_last_seen' => 'Lat seen',
+	'Class:SynchroReplica/Attribute:status_last_seen' => 'Last seen',
 	'Class:SynchroReplica/Attribute:status' => 'Status',
 	'Class:SynchroReplica/Attribute:status' => 'Status',
 	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Modified',
 	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Modified',
 	'Class:SynchroReplica/Attribute:status/Value:new' => 'New',
 	'Class:SynchroReplica/Attribute:status/Value:new' => 'New',
@@ -726,6 +727,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Synchronized',
 	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Synchronized',
 	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Object Created ?',
 	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Object Created ?',
 	'Class:SynchroReplica/Attribute:status_last_error' => 'Last Error',
 	'Class:SynchroReplica/Attribute:status_last_error' => 'Last Error',
+	'Class:SynchroReplica/Attribute:status_last_warning' => 'Warnings',
 	'Class:SynchroReplica/Attribute:info_creation_date' => 'Creation Date',
 	'Class:SynchroReplica/Attribute:info_creation_date' => 'Creation Date',
 	'Class:SynchroReplica/Attribute:info_last_modified' => 'Last Modified Date',
 	'Class:SynchroReplica/Attribute:info_last_modified' => 'Last Modified Date',
 	'Class:appUserPreferences' => 'User Preferences',
 	'Class:appUserPreferences' => 'User Preferences',

+ 4 - 0
dictionaries/fr.dictionary.itop.core.php

@@ -386,6 +386,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:SynchroReplica/Attribute:status_dest_creator+' => '',
 	'Class:SynchroReplica/Attribute:status_dest_creator+' => '',
 	'Class:SynchroReplica/Attribute:status_last_error' => 'Dernière erreur',
 	'Class:SynchroReplica/Attribute:status_last_error' => 'Dernière erreur',
 	'Class:SynchroReplica/Attribute:status_last_error+' => '',
 	'Class:SynchroReplica/Attribute:status_last_error+' => '',
+	'Class:SynchroReplica/Attribute:status_last_warning' => 'Avertissements',
+	'Class:SynchroReplica/Attribute:status_last_warning+' => '',
 	'Class:SynchroReplica/Attribute:info_creation_date' => 'Date de création',
 	'Class:SynchroReplica/Attribute:info_creation_date' => 'Date de création',
 	'Class:SynchroReplica/Attribute:info_creation_date+' => '',
 	'Class:SynchroReplica/Attribute:info_creation_date+' => '',
 	'Class:SynchroReplica/Attribute:info_last_modified' => 'Date de dernière modification',
 	'Class:SynchroReplica/Attribute:info_last_modified' => 'Date de dernière modification',
@@ -605,6 +607,8 @@ Opérateurs :<br/>
 	'Core:SyncDataSourceObsolete' => 'Cette source de données est obsolète. Opération annulée.',
 	'Core:SyncDataSourceObsolete' => 'Cette source de données est obsolète. Opération annulée.',
 	'Core:SyncDataSourceAccessRestriction' => 'Seuls les administrateurs et l\'utilisateur spécifié dans la source de données peuvent exécuter cette synchronisation. Opération annulée.',
 	'Core:SyncDataSourceAccessRestriction' => 'Seuls les administrateurs et l\'utilisateur spécifié dans la source de données peuvent exécuter cette synchronisation. Opération annulée.',
 	'Core:SyncTooManyMissingReplicas' => 'Tous les réplicas sont absents de l\'import. L\'import a-t-il réellement tourné. Opération annulée.',
 	'Core:SyncTooManyMissingReplicas' => 'Tous les réplicas sont absents de l\'import. L\'import a-t-il réellement tourné. Opération annulée.',
+	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s erreur(s), %3$s avertissement(s).',
+	'Core:SynchroReplica:TargetObject' => 'Objet Synchronisé : %1$s',
 	'Core:Duration_Seconds' => '%1$ds',
 	'Core:Duration_Seconds' => '%1$ds',
 	'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
 	'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
 	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
 	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',