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

Improve invalid key messages

Browse Source 
[MAILPOET-2431]
This commit is contained in:
Jan Jakeš
2019-12-18 13:19:35 +01:00
committed by Jack Kitterhing
parent 97a0f62d2c
commit 61d66d730e
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/js/src/settings/premium_tab/messages/mss_messages.jsx
View File

@@ -16,7 +16,7 @@ const activeMessage = () => (
const notValidMessage = (message) => ( const notValidMessage = (message) => (
<div className="mailpoet_error"> <div className="mailpoet_error">
{message} {message || MailPoet.I18n.t('premiumTabMssKeyNotValidMessage')}
</div> </div>
); );
@@ -38,7 +38,7 @@ const MssMessages = (props) => {
case MssStatus.KEY_VALID_MSS_NOT_ACTIVE: case MssStatus.KEY_VALID_MSS_NOT_ACTIVE:
return mssNotActiveMessage(props.activationCallback); return mssNotActiveMessage(props.activationCallback);
case MssStatus.KEY_INVALID: case MssStatus.KEY_INVALID:
return props.keyMessage ? notValidMessage(props.keyMessage) : null; return notValidMessage(props.keyMessage);
default: default:
return null; return null;
} }

4
assets/js/src/settings/premium_tab/messages/premium_messages.jsx
View File

@@ -52,7 +52,7 @@ const premiumNotActiveMessage = (activationCallback) => (
const notValidMessage = (message) => ( const notValidMessage = (message) => (
<div className="mailpoet_error"> <div className="mailpoet_error">
{message} {message || MailPoet.I18n.t('premiumTabPremiumKeyNotValidMessage')}
</div> </div>
); );
@@ -69,7 +69,7 @@ const getMessageFromStatus = (status, message, installationCallback, activationC
case PremiumStatus.KEY_VALID_PREMIUM_PLUGIN_BEING_ACTIVATED: case PremiumStatus.KEY_VALID_PREMIUM_PLUGIN_BEING_ACTIVATED:
return activatingMessage(); return activatingMessage();
case PremiumStatus.KEY_INVALID: case PremiumStatus.KEY_INVALID:
return message ? notValidMessage(message) : null; return notValidMessage(message);
default: default:
return null; return null;
} }

2
views/settings.html
View File

@@ -315,8 +315,10 @@
'premiumTabPremiumInstallationActivatingMessage': __('activating MailPoet Premium…', 'mailpoet'), 'premiumTabPremiumInstallationActivatingMessage': __('activating MailPoet Premium…', 'mailpoet'),
'premiumTabPremiumInstallationActiveMessage': __('MailPoet Premium is active!', 'mailpoet'), 'premiumTabPremiumInstallationActiveMessage': __('MailPoet Premium is active!', 'mailpoet'),
'premiumTabPremiumInstallationErrorMessage': __('Something went wrong. Please [link]download the Premium plugin from your account[/link] and [link]contact our support team[/link].', 'mailpoet'), 'premiumTabPremiumInstallationErrorMessage': __('Something went wrong. Please [link]download the Premium plugin from your account[/link] and [link]contact our support team[/link].', 'mailpoet'),
'premiumTabPremiumKeyNotValidMessage': __('Your key is not valid for MailPoet Premium', 'mailpoet'),
'premiumTabMssActiveMessage': __('MailPoet Sending Service is active', 'mailpoet'), 'premiumTabMssActiveMessage': __('MailPoet Sending Service is active', 'mailpoet'),
'premiumTabMssNotActiveMessage': __('MailPoet Sending Service is not active.', 'mailpoet'), 'premiumTabMssNotActiveMessage': __('MailPoet Sending Service is not active.', 'mailpoet'),
'premiumTabMssActivateMessage': __('Activate MailPoet Sending Service', 'mailpoet'), 'premiumTabMssActivateMessage': __('Activate MailPoet Sending Service', 'mailpoet'),
'premiumTabMssKeyNotValidMessage': __('Your key is not valid for the MailPoet Sending Service', 'mailpoet'),
}) %> }) %>
<% endblock %> <% endblock %>