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

Improve message handling

Browse Source 
[MAILPOET-1890]
This commit is contained in:
Pavel Dohnal
2019-03-21 10:44:14 +01:00
committed by M. Shull
parent 6fc68bb979
commit 7067b82e06
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,14 +12,14 @@ const NewInstallationWithMSSWarning = ({ emailAddress }) => (
<p className="sender_email_address_warning"> <p className="sender_email_address_warning">
{ReactStringReplace( {ReactStringReplace(
MailPoet.I18n.t('senderEmailAddressNewInstallWarning1'), MailPoet.I18n.t('senderEmailAddressNewInstallWarning1'),
/<em>%originalSender<\/em>/, '%originalSender',
() => <em key="reply-to">{ emailAddress }</em> () => <em key="reply-to">{ emailAddress }</em>
)} )}
</p> </p>
<p className="sender_email_address_warning"> <p className="sender_email_address_warning">
{ReactStringReplace( {ReactStringReplace(
MailPoet.I18n.t('senderEmailAddressNewInstallWarning2'), MailPoet.I18n.t('senderEmailAddressNewInstallWarning2'),
/(<em>%suggested<\/em>|<em>%originalSender<\/em>)/, /(%suggested|%originalSender)/,
(match) => { (match) => {
if (match === '<em>%suggested</em>') return <em key="suggested-email">{ suggestedEmailAddress }</em>; if (match === '<em>%suggested</em>') return <em key="suggested-email">{ suggestedEmailAddress }</em>;
return <em key="sender-email">{ emailAddress }</em>; return <em key="sender-email">{ emailAddress }</em>;

4
views/layout.html
View File

@@ -70,8 +70,8 @@ jQuery('.toplevel_page_mailpoet-newsletters.menu-top-last')
'senderEmailAddressWarning2': _x('Use an address like %suggested for the Sender and put %originalSender in 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 <em>Reply-to</em> field below.', 'In the last step, before sending a newsletter. URL: ?page=mailpoet-newsletters#/send/2'),
'senderEmailAddressWarning3': _x('Read more.'), 'senderEmailAddressWarning3': _x('Read more.'),
'senderEmailAddressNewInstallWarning1': __('The MailPoet Sending Service can’t send email with the email address <em>%originalSender</em>.'), 'senderEmailAddressNewInstallWarning1': __('The MailPoet Sending Service can’t send email with the email address %originalSender.'),
'senderEmailAddressNewInstallWarning2': __('You have to use an address like <em>%suggested</em> and put <em>%originalSender</em>‌‌‌‌ in the Reply-to field below.'), 'senderEmailAddressNewInstallWarning2': __('You have to use an address like %suggested and put %originalSender‌‌‌‌ in the Reply-to field below.'),
'senderEmailAddressNewInstallWarning3': __('This new email address has to be authorized first in your account.'), 'senderEmailAddressNewInstallWarning3': __('This new email address has to be authorized first in your account.'),
'senderEmailAddressNewInstallWarning4': __('Authorize your email.'), 'senderEmailAddressNewInstallWarning4': __('Authorize your email.'),
}) %> }) %>