Skip to content

Commit

Permalink
Merge pull request #25 from mailjet/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
JasenAngelov authored Jun 3, 2019
2 parents d388ee1 + 04834de commit 5727d03
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
8 changes: 4 additions & 4 deletions Classes/Service/DefaultMessagesService.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ class DefaultMessagesService

private $confMessage = 'Subscription confirmation email sent to %email. Please check your inbox and confirm the subscription.';

private $subscribeError = 'Subscribe error. Please try again later!';
private $subscribeError = 'Subscription error. Please try again later!';

private static $memberExist = 'The contact %email is already subscribed!';

private $thanksMessage = 'Thanks for subscribing!';

private $headingText = 'Please Confirm Your Subscription To';
private $headingText = 'Please confirm your subscription to';

private $emailFooterMsg = 'Did not ask to subscribe to this list? Or maybe you have changed your mind? Then simply ignore this email and you will not be subscribed.';

Expand All @@ -30,7 +30,7 @@ class DefaultMessagesService

private static $successMessage = 'You have successfully subscribed!';

private static $dataTypeMessage = 'Please enter the correct values according to the example of the description in the field: %id.';
private static $dataTypeMessage = 'Please enter the correct values according to the example in the field: %id.';

public function __construct(FormDto $formDto)
{
Expand Down Expand Up @@ -150,4 +150,4 @@ public static function getSubscribedMessage($email)

return str_replace('%email', $email, $message);
}
}
}
18 changes: 9 additions & 9 deletions Resources/Private/Language/locallang.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,22 @@
%email. Please check your inbox and confirm the subscription. (Note: The '%email' symbol will be
replaced by the email address of the subscriber)
</label>
<label index="flexform.dataTypeMessage">Data type mismatch - Default: Please enter the correct values according to
the example of the description in the field: %id. (Note: The %id symbol will be replaced by the name of
<label index="flexform.dataTypeMessage">Data type mismatch - Default: Please enter correct values according to
the example in the field: %id. (Note: The %id symbol will be replaced by the name of
field and the %type symbol will be replaced by the type of data required by the field)
</label>
<label index="flexform.subscribeError">Subscribe error. Please try again later! - This message will appear
in case an error occurs during subscription form submission.
<label index="flexform.subscribeError">Subscription error. Please try again later! - Message shown in case
an error occurs during subscription form submission.
</label>
<label index="flexform.memberExist">The contact %email is already subscribed - This message will appear when
the subscriber already exists in your Mailjet contact list. (Note: The %email symbol will be replaced by the email
<label index="flexform.memberExist">The contact %email is already subscribed - Message shown in case the
subscriber already exists in your Mailjet contact list. (Note: The %email symbol will be replaced by the email
address of the subscriber)
</label>
<label index="flexform.finalMessage">Thanks for subscribing - This message will appear when
the subscriber is successfully added to the contact list.
<label index="flexform.finalMessage">Thanks for subscribing - Message shown in case the subscriber
is successfully added to the contact list.
</label>
<label index="flexform.email">Email field label</label>
<label index="flexform.emailSender">* Email FROM address - this is a required field! This is the email address used to send
<label index="flexform.emailSender">* Email FROM address - This is a required field! This is the email address used to send
the confirmation email to the subscriber! Use one of your validated sender email addresses from your Mailjet account.
If the field is empty the subscriber will not receive the confirmation email and will not be able to subscribe!
</label>
Expand Down

0 comments on commit 5727d03

Please sign in to comment.