diff --git a/core/modules/aggregator/src/Controller/AggregatorController.php b/core/modules/aggregator/src/Controller/AggregatorController.php index 7eed904..d0efda2 100644 --- a/core/modules/aggregator/src/Controller/AggregatorController.php +++ b/core/modules/aggregator/src/Controller/AggregatorController.php @@ -129,7 +129,7 @@ public function adminOverview() { $refresh_rate = $feed->getRefreshRate(); $row[] = ($last_checked ? $this->t('@time ago', array('@time' => $this->dateFormatter->formatInterval(REQUEST_TIME - $last_checked))) : $this->t('never')); if (!$last_checked && $refresh_rate) { - $next_update = $this->t('immediately'); + $next_update = $this->t('imminently'); } elseif ($last_checked && $refresh_rate) { $next_update = $next = $this->t('%time left', array('%time' => $this->dateFormatter->formatInterval($last_checked + $refresh_rate - REQUEST_TIME))); diff --git a/core/modules/aggregator/src/Tests/FeedAdminDisplayTest.php b/core/modules/aggregator/src/Tests/FeedAdminDisplayTest.php index 4881dd6..799d4dc 100644 --- a/core/modules/aggregator/src/Tests/FeedAdminDisplayTest.php +++ b/core/modules/aggregator/src/Tests/FeedAdminDisplayTest.php @@ -27,7 +27,7 @@ public function testFeedUpdateFields() { // The scheduled feed shows that it has not been updated yet and is // scheduled. $this->assertText('never', 'The scheduled feed has not been updated yet. Last update shows "never".'); - $this->assertText('immediately', 'The scheduled feed has not been updated yet. Next update shows "immediately".'); + $this->assertText('imminently', 'The scheduled feed has not been updated yet. Next update shows "imminently".'); $this->assertNoText('ago', 'The scheduled feed has not been updated yet. Last update does not show "x x ago".'); $this->assertNoText('left', 'The scheduled feed has not been updated yet. Next update does not show "x x left".'); @@ -38,7 +38,7 @@ public function testFeedUpdateFields() { // After the update, an interval should be displayed on both last updated // and next update. $this->assertNoText('never', 'The scheduled feed has been updated. Last updated changed.'); - $this->assertNoText('immediately', 'The scheduled feed has been updated. Next update changed.'); + $this->assertNoText('imminently', 'The scheduled feed has been updated. Next update changed.'); $this->assertText('ago', 'The scheduled feed been updated. Last update shows "x x ago".'); $this->assertText('left', 'The scheduled feed has been updated. Next update shows "x x left".'); @@ -52,7 +52,7 @@ public function testFeedUpdateFields() { $this->drupalGet('admin/config/services/aggregator'); // The non scheduled feed shows that it has not been updated yet. $this->assertText('never', 'The non scheduled feed has not been updated yet. Last update shows "never".'); - $this->assertNoText('immediately', 'The non scheduled feed does not show "immediately" as next update.'); + $this->assertNoText('imminently', 'The non scheduled feed does not show "imminently" as next update.'); $this->assertNoText('ago', 'The non scheduled feed has not been updated. It does not show "x x ago" as last update.'); $this->assertNoText('left', 'The feed is not scheduled. It does not show a timeframe "x x left" for next update.'); @@ -61,7 +61,7 @@ public function testFeedUpdateFields() { // After the feed update, we still need to see "never" as next update // label. Last update will show an interval. - $this->assertNoText('immediately', 'The updated non scheduled feed does not show "immediately" as next update.'); + $this->assertNoText('imminently', 'The updated non scheduled feed does not show "imminently" as next update.'); $this->assertText('never', 'The updated non scheduled feed still shows "never" as next update.'); $this->assertText('ago', 'The non scheduled feed has been updated. It shows "x x ago" as last update.'); $this->assertNoText('left', 'The feed is not scheduled. It does not show a timeframe "x x left" for next update.');