//reload from cache table
$cacheKeyString = CRM_Dedupe_Merger::getMergeCacheKeyString($rgid, $gid, $criteria);
- $stats = CRM_Dedupe_Merger::getMergeStatsMsg($cacheKeyString);
+ $stats = CRM_Dedupe_Merger::getMergeStats($cacheKeyString);
if ($stats) {
- CRM_Core_Session::setStatus($stats, ts('Batch Complete'), 'alert', array('expires' => 0));
+ $message = CRM_Dedupe_Merger::getMergeStatsMsg($stats);
+ $status = empty($stats['skipped']) ? 'success' : 'alert';
+ CRM_Core_Session::setStatus($message, ts('Batch Complete'), $status, array('expires' => 0));
// reset so we not displaying same message again
CRM_Dedupe_Merger::resetMergeStats($cacheKeyString);
}
/**
* Get merge statistics message.
*
- * @param string $cacheKeyString
+ * @param array $stats
*
* @return string
*/
- public static function getMergeStatsMsg($cacheKeyString) {
- $msg = '';
- $stats = CRM_Dedupe_Merger::getMergeStats($cacheKeyString);
+ public static function getMergeStatsMsg($stats) {
+ $msg = '';
if (!empty($stats['merged'])) {
- $msg = "{$stats['merged']} " . ts('Contact(s) were merged.');
+ $msg = '<p>' . ts('One contact merged.', array(1 => $stats['merged'], 'plural' => '%1 contacts merged.')) . '</p>';
}
if (!empty($stats['skipped'])) {
- $msg .= $stats['skipped'] . ts(' Contact(s) were skipped.');
+ $msg .= '<p>' . ts('One contact was skipped.', array(1 => $stats['skipped'], 'plural' => '%1 contacts were skipped.')) . '</p>';
}
return $msg;
}