fix: check if salutation already exists in email body #13196
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed within 3 days if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing. |
|
@Mergifyio backport version-13-hotfix develop |
This was referenced May 28, 2021
|
Command
|
surajshetty3416
pushed a commit
that referenced
this pull request
May 28, 2021
barredterra
reviewed
Jun 15, 2021
| const SALUTATION_END_COMMENT = "<!-- salutation-ends -->"; | ||
| if (this.real_name && !message.includes(SALUTATION_END_COMMENT)) { | ||
| this.message = ` | ||
| <p>${__('Dear')} ${this.real_name},</p> |
There was a problem hiding this comment.
Thanks for fixing! By the way, __('Dear') is impossible to translate correctly without knowing how it is used here. __('Dear {},', [this.real_name], 'Salutation in Email') would be a bit easier.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Prevents salutation from being rendered multiple times.