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

Update Premium & MSS messages

Browse Source 
[MAILPOET-2431]
This commit is contained in:
Jan Jakeš
2019-12-18 11:40:48 +01:00
committed by Jack Kitterhing
parent 10689f7a3c
commit 97a0f62d2c
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/API/JSON/v1/Services.php
View File

@ -89,7 +89,7 @@ class Services extends APIEndpoint {
$successMessage = null; $successMessage = null;
if ($state == Bridge::KEY_VALID) { if ($state == Bridge::KEY_VALID) {
$successMessage = WPFunctions::get()->__('Your MailPoet Sending Service key has been successfully validated.', 'mailpoet'); $successMessage = WPFunctions::get()->__('Your MailPoet Sending Service key has been successfully validated', 'mailpoet');
} elseif ($state == Bridge::KEY_EXPIRING) { } elseif ($state == Bridge::KEY_EXPIRING) {
$successMessage = sprintf( $successMessage = sprintf(
WPFunctions::get()->__('Your MailPoet Sending Service key expires on %s!', 'mailpoet'), WPFunctions::get()->__('Your MailPoet Sending Service key expires on %s!', 'mailpoet'),
@ -107,10 +107,10 @@ class Services extends APIEndpoint {
switch ($state) { switch ($state) {
case Bridge::KEY_INVALID: case Bridge::KEY_INVALID:
$error = WPFunctions::get()->__('Your MailPoet Sending Service key is invalid.', 'mailpoet'); $error = WPFunctions::get()->__('Your key is not valid for the MailPoet Sending Service', 'mailpoet');
break; break;
case Bridge::KEY_ALREADY_USED: case Bridge::KEY_ALREADY_USED:
$error = WPFunctions::get()->__('Your MailPoet Sending Service key is already used on another site.', 'mailpoet'); $error = WPFunctions::get()->__('Your MailPoet Sending Service key is already used on another site', 'mailpoet');
break; break;
default: default:
$code = !empty($result['code']) ? $result['code'] : Bridge::CHECK_ERROR_UNKNOWN; $code = !empty($result['code']) ? $result['code'] : Bridge::CHECK_ERROR_UNKNOWN;
@ -151,10 +151,10 @@ class Services extends APIEndpoint {
$successMessage = null; $successMessage = null;
if ($state == Bridge::KEY_VALID) { if ($state == Bridge::KEY_VALID) {
$successMessage = WPFunctions::get()->__('Your Premium key has been successfully validated.', 'mailpoet'); $successMessage = WPFunctions::get()->__('Your Premium key has been successfully validated', 'mailpoet');
} elseif ($state == Bridge::KEY_EXPIRING) { } elseif ($state == Bridge::KEY_EXPIRING) {
$successMessage = sprintf( $successMessage = sprintf(
WPFunctions::get()->__('Your Premium key expires on %s.', 'mailpoet'), WPFunctions::get()->__('Your Premium key expires on %s', 'mailpoet'),
$this->dateTime->formatDate(strtotime($result['data']['expire_at'])) $this->dateTime->formatDate(strtotime($result['data']['expire_at']))
); );
} }
@ -172,10 +172,10 @@ class Services extends APIEndpoint {
switch ($state) { switch ($state) {
case Bridge::KEY_INVALID: case Bridge::KEY_INVALID:
$error = WPFunctions::get()->__('Your Premium key is invalid.', 'mailpoet'); $error = WPFunctions::get()->__('Your key is not valid for MailPoet Premium', 'mailpoet');
break; break;
case Bridge::KEY_ALREADY_USED: case Bridge::KEY_ALREADY_USED:
$error = WPFunctions::get()->__('Your Premium key is already used on another site.', 'mailpoet'); $error = WPFunctions::get()->__('Your Premium key is already used on another site', 'mailpoet');
break; break;
default: default:
$code = !empty($result['code']) ? $result['code'] : Bridge::CHECK_ERROR_UNKNOWN; $code = !empty($result['code']) ? $result['code'] : Bridge::CHECK_ERROR_UNKNOWN;

4
tests/acceptance/AddSendingKeyCest.php
View File

@ -38,8 +38,8 @@ class AddSendingKeyCest {
// try invalid key // try invalid key
$i->fillField(['name' => 'premium[premium_key]'], 'invalid-key'); $i->fillField(['name' => 'premium[premium_key]'], 'invalid-key');
$i->click('Verify'); $i->click('Verify');
$i->waitForText('Your MailPoet Sending Service key is invalid.'); $i->waitForText('Your key is not valid for the MailPoet Sending Service');
$i->waitForText('Your Premium key is invalid.'); $i->waitForText('Your key is not valid for MailPoet Premium');
} }
public function installAndActivatePremiumPlugin(\AcceptanceTester $i, Scenario $scenario) { public function installAndActivatePremiumPlugin(\AcceptanceTester $i, Scenario $scenario) {