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

Display the correct domain in the message

Browse Source 
[MAILPOET-1573]
This commit is contained in:
Pavel Dohnal
2019-01-22 14:34:10 +01:00
parent 4fb4e5a37a
commit 8cba3ba9d2
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
assets/js/src/common/sender_email_address_warning.jsx
View File

@@ -53,16 +53,17 @@ const badDomains = [
]; ];
const SenderEmailAddressWarning = ({ emailAddress }) => { const SenderEmailAddressWarning = ({ emailAddress }) => {
const domain = emailAddress.split('@').pop().toLowerCase(); const emailAddressDomain = emailAddress.split('@').pop().toLowerCase();
if (badDomains.indexOf(domain) > -1) { if (badDomains.indexOf(emailAddressDomain) > -1) {
const userHostDomain = window.location.hostname.replace('www.', '');
return (<React.Fragment> return (<React.Fragment>
<p className="sender_email_address_warning">{MailPoet.I18n.t('senderEmailAddressWarning1')}</p> <p className="sender_email_address_warning">{MailPoet.I18n.t('senderEmailAddressWarning1')}</p>
<p className="sender_email_address_warning"> <p className="sender_email_address_warning">
{ReactStringReplace( {ReactStringReplace(
MailPoet.I18n.t('senderEmailAddressWarning2'), MailPoet.I18n.t('senderEmailAddressWarning2'),
/(%userDomain|%originalSender|<em>.*<\/em>)/, /(%suggested|%originalSender|<em>.*<\/em>)/,
(match) => { (match) => {
if (match === '%userDomain') return 'user domain'; // TODO replace with the real domain if (match === '%suggested') return `info@${userHostDomain}`;
if (match === '%originalSender') return <em key="sender-email">{ emailAddress }</em>; if (match === '%originalSender') return <em key="sender-email">{ emailAddress }</em>;
return <em key="reply-to">{match.replace(/<\/?em>/g, '')}</em>; return <em key="reply-to">{match.replace(/<\/?em>/g, '')}</em>;
} }

4
views/layout.html
View File

@@ -67,8 +67,8 @@ jQuery('.toplevel_page_mailpoet-newsletters.menu-top-last')
<%= localize({ <%= localize({
'ajaxFailedErrorMessage': __('An error has happened while performing a request, the server has responded with response code %d'), 'ajaxFailedErrorMessage': __('An error has happened while performing a request, the server has responded with response code %d'),
'senderEmailAddressWarning1': _x('You might not reach the inbox of your subscribers if you use this email address.', 'In the last step, before sending a newsletter. URL: ?page=mailpoet-newsletters#/send/2'), 'senderEmailAddressWarning1': _x('You might not reach the inbox of your subscribers if you use this email address.', 'In the last step, before sending a newsletter. URL: ?page=mailpoet-newsletters#/send/2'),
'senderEmailAddressWarning2': _x('Use an address like s%userDomain for the Sender and put %originalSender in the the <em>Reply-to</em> field below.', 'In the last step, before sending a newsletter. URL: ?page=mailpoet-newsletters#/send/2'), 'senderEmailAddressWarning2': _x('Use an address like %suggested for the Sender and put %originalSender in the the <em>Reply-to</em> field below.', 'In the last step, before sending a newsletter. URL: ?page=mailpoet-newsletters#/send/2'),
'senderEmailAddressWarning3': __('Read more.'), 'senderEmailAddressWarning3': _x('Read more.'),
}) %> }) %>
<% block translations %><% endblock %> <% block translations %><% endblock %>