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

Use WordPress translation functions directly

Browse Source 
[MAILPOET-4302]
This commit is contained in:
Rostislav Wolny
2022-08-04 15:01:04 +02:00
committed by Veljko V
parent f4346c8957
commit c58c613959
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mailpoet/lib/API/JSON/v1/Settings.php
View File

@ -257,7 +257,7 @@ class Settings extends APIEndpoint {
if (!$domain) { if (!$domain) {
return $this->badRequest([ return $this->badRequest([
APIError::BAD_REQUEST => WPFunctions::get()->__('No sender domain specified.', 'mailpoet'), APIError::BAD_REQUEST => __('No sender domain specified.', 'mailpoet'),
]); ]);
} }
@ -273,7 +273,7 @@ class Settings extends APIEndpoint {
if (!$domain) { if (!$domain) {
return $this->badRequest([ return $this->badRequest([
APIError::BAD_REQUEST => WPFunctions::get()->__('No sender domain specified.', 'mailpoet'), APIError::BAD_REQUEST => __('No sender domain specified.', 'mailpoet'),
]); ]);
} }
@ -288,7 +288,7 @@ class Settings extends APIEndpoint {
if (!$domain) { if (!$domain) {
return $this->badRequest([ return $this->badRequest([
APIError::BAD_REQUEST => WPFunctions::get()->__('No sender domain specified.', 'mailpoet'), APIError::BAD_REQUEST => __('No sender domain specified.', 'mailpoet'),
]); ]);
} }
@ -304,7 +304,7 @@ class Settings extends APIEndpoint {
$response = $this->senderDomainController->getDomainRecords($domain); $response = $this->senderDomainController->getDomainRecords($domain);
} else { } else {
return $this->badRequest([ return $this->badRequest([
APIError::BAD_REQUEST => WPFunctions::get()->__($e->getMessage(), 'mailpoet'), APIError::BAD_REQUEST => __($e->getMessage(), 'mailpoet'),
]); ]);
} }
} }
@ -317,7 +317,7 @@ class Settings extends APIEndpoint {
if (!$domain) { if (!$domain) {
return $this->badRequest([ return $this->badRequest([
APIError::BAD_REQUEST => WPFunctions::get()->__('No sender domain specified.', 'mailpoet'), APIError::BAD_REQUEST => __('No sender domain specified.', 'mailpoet'),
]); ]);
} }
@ -333,7 +333,7 @@ class Settings extends APIEndpoint {
$response = ['ok' => true, 'dns' => $this->senderDomainController->getDomainRecords($domain)]; $response = ['ok' => true, 'dns' => $this->senderDomainController->getDomainRecords($domain)];
} else { } else {
return $this->badRequest([ return $this->badRequest([
APIError::BAD_REQUEST => WPFunctions::get()->__($e->getMessage(), 'mailpoet'), APIError::BAD_REQUEST => __($e->getMessage(), 'mailpoet'),
]); ]);
} }
} }
@ -341,7 +341,7 @@ class Settings extends APIEndpoint {
if (!$response['ok']) { if (!$response['ok']) {
// sender domain verification error. probably an improper setup // sender domain verification error. probably an improper setup
return $this->badRequest([ return $this->badRequest([
APIError::BAD_REQUEST => WPFunctions::get()->__($response['error'] ?? 'failed sender domain verification', 'mailpoet'), APIError::BAD_REQUEST => __($response['error'] ?? 'failed sender domain verification', 'mailpoet'),
], $response); ], $response);
} }

4
mailpoet/lib/Services/Bridge/API.php
View File

@ -261,7 +261,7 @@ class API {
]; ];
$this->loggerFactory->getLogger(LoggerFactory::TOPIC_BRIDGE)->error('createAuthorizedSenderDomain API call failed.', $logData); $this->loggerFactory->getLogger(LoggerFactory::TOPIC_BRIDGE)->error('createAuthorizedSenderDomain API call failed.', $logData);
$fallbackError = sprintf($this->wp->__('An error has happened while performing a request, the server has responded with response code %d'), $code); $fallbackError = sprintf(__('An error has happened while performing a request, the server has responded with response code %d'), $code);
$errorData = is_array($responseBody) && isset($responseBody['error']) ? $responseBody['error'] : $fallbackError; $errorData = is_array($responseBody) && isset($responseBody['error']) ? $responseBody['error'] : $fallbackError;
return ['error' => $errorData, 'status' => false]; return ['error' => $errorData, 'status' => false];
@ -299,7 +299,7 @@ class API {
]; ];
$this->loggerFactory->getLogger(LoggerFactory::TOPIC_BRIDGE)->error('verifyAuthorizedSenderDomain API call failed.', $logData); $this->loggerFactory->getLogger(LoggerFactory::TOPIC_BRIDGE)->error('verifyAuthorizedSenderDomain API call failed.', $logData);
$fallbackError = sprintf($this->wp->__('An error has happened while performing a request, the server has responded with response code %d'), $code); $fallbackError = sprintf(__('An error has happened while performing a request, the server has responded with response code %d'), $code);
$errorData = is_array($responseBody) && isset($responseBody['error']) ? $responseBody['error'] : $fallbackError; $errorData = is_array($responseBody) && isset($responseBody['error']) ? $responseBody['error'] : $fallbackError;
return ['error' => $errorData, 'status' => false]; return ['error' => $errorData, 'status' => false];