Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Change admin notices messages

Browse Source
This commit is contained in:
Amine Ben hammou
2019-06-18 12:25:22 +01:00
committed by M. Shull
parent a2700246f0
commit 7e5872eb92
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/API/JSON/v1/Newsletters.php
View File

@@ -92,7 +92,7 @@ class Newsletters extends APIEndpoint {
return $this->successResponse($newsletter, ['preview_url' => $preview_url]); return $this->successResponse($newsletter, ['preview_url' => $preview_url]);
} else { } else {
return $this->errorResponse([ return $this->errorResponse([
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet'), APIError::NOT_FOUND => WPFunctions::get()->__('This email does not exist.', 'mailpoet'),
]); ]);
} }
} }
@@ -226,7 +226,7 @@ class Newsletters extends APIEndpoint {
if ($newsletter === false) { if ($newsletter === false) {
return $this->errorResponse([ return $this->errorResponse([
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet'), APIError::NOT_FOUND => WPFunctions::get()->__('This email does not exist.', 'mailpoet'),
]); ]);
} }
@@ -274,7 +274,7 @@ class Newsletters extends APIEndpoint {
); );
} else { } else {
return $this->errorResponse([ return $this->errorResponse([
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet'), APIError::NOT_FOUND => WPFunctions::get()->__('This email does not exist.', 'mailpoet'),
]); ]);
} }
} }
@@ -293,7 +293,7 @@ class Newsletters extends APIEndpoint {
); );
} else { } else {
return $this->errorResponse([ return $this->errorResponse([
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet'), APIError::NOT_FOUND => WPFunctions::get()->__('This email does not exist.', 'mailpoet'),
]); ]);
} }
} }
@@ -306,7 +306,7 @@ class Newsletters extends APIEndpoint {
return $this->successResponse(null, ['count' => 1]); return $this->successResponse(null, ['count' => 1]);
} else { } else {
return $this->errorResponse([ return $this->errorResponse([
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet'), APIError::NOT_FOUND => WPFunctions::get()->__('This email does not exist.', 'mailpoet'),
]); ]);
} }
} }
@@ -335,7 +335,7 @@ class Newsletters extends APIEndpoint {
} }
} else { } else {
return $this->errorResponse([ return $this->errorResponse([
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet'), APIError::NOT_FOUND => WPFunctions::get()->__('This email does not exist.', 'mailpoet'),
]); ]);
} }
} }
@@ -370,7 +370,7 @@ class Newsletters extends APIEndpoint {
); );
} else { } else {
return $this->errorResponse([ return $this->errorResponse([
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet'), APIError::NOT_FOUND => WPFunctions::get()->__('This email does not exist.', 'mailpoet'),
]); ]);
} }
} }
@@ -445,7 +445,7 @@ class Newsletters extends APIEndpoint {
} }
} else { } else {
return $this->errorResponse([ return $this->errorResponse([
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet'), APIError::NOT_FOUND => WPFunctions::get()->__('This email does not exist.', 'mailpoet'),
]); ]);
} }
} }

2
lib/API/JSON/v1/SendingTaskSubscribers.php
View File

@@ -47,7 +47,7 @@ class SendingTaskSubscribers extends APIEndpoint {
->findArray(); ->findArray();
if (empty($tasks_ids)) { if (empty($tasks_ids)) {
return $this->errorResponse([ return $this->errorResponse([
APIError::NOT_FOUND => __('This newsletter is not being sent to any subcriber yet.', 'mailpoet'), APIError::NOT_FOUND => __( 'This email has not been sent yet.', 'mailpoet'),
]); ]);
} }
$data['params']['task_ids'] = array_column($tasks_ids, 'task_id'); $data['params']['task_ids'] = array_column($tasks_ids, 'task_id');

6
tests/integration/API/JSON/v1/NewslettersTest.php
View File

@@ -111,12 +111,12 @@ class NewslettersTest extends \MailPoetTest {
$response = $this->endpoint->get(); // missing id $response = $this->endpoint->get(); // missing id
expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND); expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
expect($response->errors[0]['message']) expect($response->errors[0]['message'])
->equals('This newsletter does not exist.'); ->equals('This email does not exist.');
$response = $this->endpoint->get(['id' => 'not_an_id']); $response = $this->endpoint->get(['id' => 'not_an_id']);
expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND); expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
expect($response->errors[0]['message']) expect($response->errors[0]['message'])
->equals('This newsletter does not exist.'); ->equals('This email does not exist.');
$wp = Stub::make(new WPFunctions, [ $wp = Stub::make(new WPFunctions, [
'applyFilters' => asCallable([WPHooksHelper::class, 'applyFilters']), 'applyFilters' => asCallable([WPHooksHelper::class, 'applyFilters']),
@@ -421,7 +421,7 @@ class NewslettersTest extends \MailPoetTest {
); );
expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND); expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
expect($response->errors[0]['message']) expect($response->errors[0]['message'])
->equals('This newsletter does not exist.'); ->equals('This email does not exist.');
} }
function testItReschedulesPastDuePostNotificationsWhenStatusIsSetBackToActive() { function testItReschedulesPastDuePostNotificationsWhenStatusIsSetBackToActive() {

4
tests/integration/API/JSON/v1/SendingTaskSubscribersTest.php
View File

@@ -72,7 +72,7 @@ class SendingTaskSubscribersTest extends \MailPoetTest {
]); ]);
expect($res->status)->equals(APIResponse::STATUS_NOT_FOUND); expect($res->status)->equals(APIResponse::STATUS_NOT_FOUND);
expect($res->errors[0]['message']) expect($res->errors[0]['message'])
->equals('This newsletter is not being sent to any subcriber yet.'); ->equals('This email has not been sent yet.');
} }
function testListingReturnsErrorIfNewsletterNotBeingSent() { function testListingReturnsErrorIfNewsletterNotBeingSent() {
@@ -87,7 +87,7 @@ class SendingTaskSubscribersTest extends \MailPoetTest {
]); ]);
expect($res->status)->equals(APIResponse::STATUS_NOT_FOUND); expect($res->status)->equals(APIResponse::STATUS_NOT_FOUND);
expect($res->errors[0]['message']) expect($res->errors[0]['message'])
->equals('This newsletter is not being sent to any subcriber yet.'); ->equals('This email has not been sent yet.');
} }
function testItReturnsListing() { function testItReturnsListing() {