diff --git a/core/CronArchive.php b/core/CronArchive.php index 28ddf49ce90755cb33979b208a52cc6ef3429449..935f99dcfa50a85b702e50817a2a866cb605f941 100644 --- a/core/CronArchive.php +++ b/core/CronArchive.php @@ -1149,19 +1149,23 @@ class CronArchive $secondsSinceLastArchive = $this->getSecondsSinceLastArchive(); if ($secondsSinceLastArchive < $secondsSinceMidnight) { - $secondsSinceMidnight = $secondsSinceLastArchive; + $secondsBackToLookForVisits = $secondsSinceLastArchive; + $sinceInfo = "(since the last successful archiving)"; + } else { + $secondsBackToLookForVisits = $secondsSinceMidnight; + $sinceInfo = "(since midnight)"; } - $from = Date::now()->subSeconds($secondsSinceMidnight)->getDatetime(); + $from = Date::now()->subSeconds($secondsBackToLookForVisits)->getDatetime(); $to = Date::now()->addHour(1)->getDatetime(); $dao = new RawLogDao(); $hasVisits = $dao->hasSiteVisitsBetweenTimeframe($from, $to, $idSite); if ($hasVisits) { - $this->logger->info("- tracking data found for website id $idSite (between $from and $to)"); + $this->logger->info("- tracking data found for website id $idSite since $from UTC $sinceInfo"); } else { - $this->logger->info("- no new tracking data for website id $idSite (between $from and $to)"); + $this->logger->info("- no new tracking data for website id $idSite since $from UTC $sinceInfo"); } return $hasVisits; diff --git a/plugins/SegmentEditor/lang/en.json b/plugins/SegmentEditor/lang/en.json index e847e3ed4b66e1c6e4df3c70c7225220f1a786da..96e36c02b77eaba69a323aa66e805d212955124e 100644 --- a/plugins/SegmentEditor/lang/en.json +++ b/plugins/SegmentEditor/lang/en.json @@ -17,7 +17,7 @@ "SaveAndApply": "Save & Apply", "SegmentDisplayedAllWebsites": "all websites", "SegmentDisplayedThisWebsiteOnly": "this website only", - "SegmentIsDisplayedForWebsite": "and displayed for", + "SegmentIsDisplayedForWebsite": "and processed for", "SegmentNotApplied": "Segment '%s' not applied", "SegmentNotAppliedMessage": "You are requesting data for the Custom Segment '%s', this Piwik configuration currently prevents real time processing of reports for performance reasons.", "SelectSegmentOfVisits": "Select a segment of visits:", diff --git a/tests/UI/expected-ui-screenshots b/tests/UI/expected-ui-screenshots index a3a5924c8530c2cbbf95071e153f26c3927e7e38..cd490aa6bcc4f50adedaadcdd979a8ffb8c4d0c5 160000 --- a/tests/UI/expected-ui-screenshots +++ b/tests/UI/expected-ui-screenshots @@ -1 +1 @@ -Subproject commit a3a5924c8530c2cbbf95071e153f26c3927e7e38 +Subproject commit cd490aa6bcc4f50adedaadcdd979a8ffb8c4d0c5