mirror of
https://github.com/Ocelot-Social-Community/Ocelot-Social.git
synced 2025-12-12 23:35:58 +00:00
fix(backend): fix e-mail character encoding (#8886)
* Improve e-mail base design * Refine e-mail design * Adjust e-mail snapshots * Avoid early html encoding for all parameters in locals * Avoid early html encoding for all '= t()' * Avoid early html encoding for the remaining '='
This commit is contained in:
parent
d437c6d7f4
commit
985a8c3720
@ -3,5 +3,5 @@ extend ../layout.pug
|
||||
block content
|
||||
.content
|
||||
- var groupUrl = groupUrl
|
||||
p= t('changedGroupMemberRole', { groupName })
|
||||
a.button(href=groupUrl)= t('buttons.viewGroup')
|
||||
p!= t('changedGroupMemberRole', { groupName })
|
||||
a.button(href=groupUrl)!= t('buttons.viewGroup')
|
||||
|
||||
@ -1 +1 @@
|
||||
= `${APPLICATION_NAME} – ${t('notification')}: ${t('subjects.changedGroupMemberRole')}`
|
||||
!= `${APPLICATION_NAME} – ${t('notification')}: ${t('subjects.changedGroupMemberRole')}`
|
||||
@ -2,7 +2,7 @@ extend ../layout.pug
|
||||
|
||||
block content
|
||||
.content
|
||||
p= t('chatMessageStart')
|
||||
a.user(href=chattingUserUrl)= chattingUser
|
||||
= t('chatMessageEnd')
|
||||
a.button(href=chatUrl)= t('buttons.viewChat')
|
||||
p!= t('chatMessageStart')
|
||||
a.user(href=chattingUserUrl)!= chattingUser
|
||||
!= t('chatMessageEnd')
|
||||
a.button(href=chatUrl)!= t('buttons.viewChat')
|
||||
|
||||
@ -1 +1 @@
|
||||
= `${APPLICATION_NAME} – ${t('notification')}: ${t('subjects.chatMessage')}`
|
||||
!= `${APPLICATION_NAME} – ${t('notification')}: ${t('subjects.chatMessage')}`
|
||||
@ -3,6 +3,6 @@ extend ../layout.pug
|
||||
block content
|
||||
.content
|
||||
p
|
||||
a.user(href=commenterUrl)= commenterName
|
||||
= t('commentedOnPost', { postTitle})
|
||||
a.button(href=commentUrl)= t('buttons.viewComment')
|
||||
a.user(href=commenterUrl)!= commenterName
|
||||
!= t('commentedOnPost', { postTitle})
|
||||
a.button(href=commentUrl)!= t('buttons.viewComment')
|
||||
|
||||
@ -1 +1 @@
|
||||
= `${APPLICATION_NAME} – ${t('notification')}: ${t('subjects.commentedOnPost')}`
|
||||
!= `${APPLICATION_NAME} – ${t('notification')}: ${t('subjects.commentedOnPost')}`
|
||||
@ -2,9 +2,9 @@ extend ../layout.pug
|
||||
|
||||
block content
|
||||
.content
|
||||
p= t('emailVerification.introduction')
|
||||
a.button(href=actionUrl)= t('buttons.verifyEmail')
|
||||
p= t('emailVerification.doNotChange')
|
||||
p!= t('emailVerification.introduction')
|
||||
a.button(href=actionUrl)!= t('buttons.verifyEmail')
|
||||
p!= t('emailVerification.doNotChange')
|
||||
|
||||
p= t('emailVerification.codeHint')
|
||||
span= nonce
|
||||
p!= t('emailVerification.codeHint')
|
||||
span!= nonce
|
||||
|
||||
@ -1 +1 @@
|
||||
= `${t('subjects.newEmail')} ${APPLICATION_NAME}`
|
||||
!= `${t('subjects.newEmail')} ${APPLICATION_NAME}`
|
||||
@ -3,6 +3,6 @@ extend ../layout.pug
|
||||
block content
|
||||
.content
|
||||
p
|
||||
a.user(href=postAuthorUrl)= postAuthorName
|
||||
= t('followedUserPosted', { postTitle })
|
||||
a.button(href=postUrl)= t('buttons.viewPost')
|
||||
a.user(href=postAuthorUrl)!= postAuthorName
|
||||
!= t('followedUserPosted', { postTitle })
|
||||
a.button(href=postUrl)!= t('buttons.viewPost')
|
||||
|
||||
@ -1 +1 @@
|
||||
= `${APPLICATION_NAME} – ${t('notification')}: ${t('subjects.followedUserPosted')}`
|
||||
!= `${APPLICATION_NAME} – ${t('notification')}: ${t('subjects.followedUserPosted')}`
|
||||
@ -2,4 +2,4 @@ footer
|
||||
.footer
|
||||
- var organizationUrl = ORGANIZATION_URL
|
||||
- var organizationName = ORGANIZATION_NAME
|
||||
a(href=organizationUrl)= organizationName
|
||||
a(href=organizationUrl)!= organizationName
|
||||
@ -4,14 +4,14 @@
|
||||
- var team = APPLICATION_NAME
|
||||
- var settingsUrl = settingsUrl
|
||||
- var renderSettingsUrl = renderSettingsUrl
|
||||
p.no-margin-top-bottom= t('general.seeYou')
|
||||
a.organization(href=organizationUrl)= team
|
||||
p.no-margin-top-bottom!= t('general.seeYou')
|
||||
a.organization(href=organizationUrl)!= team
|
||||
| !
|
||||
p.no-margin-top-bottom= t('general.yourTeam', { team })
|
||||
p.no-margin-top-bottom!= t('general.yourTeam', { team })
|
||||
|
||||
if renderSettingsUrl
|
||||
br
|
||||
p.no-margin-top-bottom= t('general.settingsHint')
|
||||
a.settings(href=settingsUrl)= t('general.settingsName')
|
||||
p.no-margin-top-bottom!= t('general.settingsHint')
|
||||
a.settings(href=settingsUrl)!= t('general.settingsName')
|
||||
| !
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
h2= `${t('general.greeting')} ${name},`
|
||||
h2!= `${t('general.greeting')} ${name},`
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
p.no-margin-top-bottom= t('support')
|
||||
a(href='mailto:' + supportEmail)= supportEmail
|
||||
p.no-margin-top-bottom!= t('support')
|
||||
a(href='mailto:' + supportEmail)!= supportEmail
|
||||
@ -1 +1 @@
|
||||
h2= `${t('general.welcome')} ${APPLICATION_NAME}!`
|
||||
h2!= `${t('general.welcome')} ${APPLICATION_NAME}!`
|
||||
@ -3,6 +3,6 @@ extend ../layout.pug
|
||||
block content
|
||||
.content
|
||||
p
|
||||
a.user(href=commenterUrl)= commenterName
|
||||
= t('mentionedInComment', { postTitle})
|
||||
a.button(href=commentUrl)= t('buttons.viewComment')
|
||||
a.user(href=commenterUrl)!= commenterName
|
||||
!= t('mentionedInComment', { postTitle})
|
||||
a.button(href=commentUrl)!= t('buttons.viewComment')
|
||||
|
||||
@ -1 +1 @@
|
||||
= `${APPLICATION_NAME} – ${t('notification')}: ${t('subjects.mentionedInComment')}`
|
||||
!= `${APPLICATION_NAME} – ${t('notification')}: ${t('subjects.mentionedInComment')}`
|
||||
@ -3,6 +3,6 @@ extend ../layout.pug
|
||||
block content
|
||||
.content
|
||||
p
|
||||
a.user(href=postAuthorUrl)= postAuthorName
|
||||
= t('mentionedInPost', { postTitle })
|
||||
a.button(href=postUrl)= t('buttons.viewPost')
|
||||
a.user(href=postAuthorUrl)!= postAuthorName
|
||||
!= t('mentionedInPost', { postTitle })
|
||||
a.button(href=postUrl)!= t('buttons.viewPost')
|
||||
|
||||
@ -1 +1 @@
|
||||
= `${APPLICATION_NAME} – ${t('notification')}: ${t('subjects.mentionedInPost')}`
|
||||
!= `${APPLICATION_NAME} – ${t('notification')}: ${t('subjects.mentionedInPost')}`
|
||||
@ -3,5 +3,5 @@ extend ../layout.pug
|
||||
block content
|
||||
.content
|
||||
- var postUrl = postUrl
|
||||
p= t('postInGroup', { postTitle})
|
||||
a.button(href=postUrl)= t('buttons.viewPost')
|
||||
p!= t('postInGroup', { postTitle})
|
||||
a.button(href=postUrl)!= t('buttons.viewPost')
|
||||
|
||||
@ -1 +1 @@
|
||||
= `${APPLICATION_NAME} – ${t('notification')}: ${t('subjects.postInGroup')}`
|
||||
!= `${APPLICATION_NAME} – ${t('notification')}: ${t('subjects.postInGroup')}`
|
||||
@ -2,14 +2,14 @@ extend ../layout.pug
|
||||
|
||||
block content
|
||||
.content
|
||||
p= t('registration.introduction')
|
||||
a.button(href=actionUrl)= t('buttons.confirmEmail')
|
||||
p= t('registration.codeHint')
|
||||
span= nonce
|
||||
p= t('registration.codeHintException')
|
||||
p!= t('registration.introduction')
|
||||
a.button(href=actionUrl)!= t('buttons.confirmEmail')
|
||||
p!= t('registration.codeHint')
|
||||
span!= nonce
|
||||
p!= t('registration.codeHintException')
|
||||
|
||||
p= t('registration.notYouStart')
|
||||
a(href=ORGANIZATION_LINK)= APPLICATION_NAME
|
||||
= t('registration.notYouEnd')
|
||||
p!= t('registration.notYouStart')
|
||||
a(href=ORGANIZATION_LINK)!= APPLICATION_NAME
|
||||
!= t('registration.notYouEnd')
|
||||
|
||||
p= t('registration.ps')
|
||||
p!= t('registration.ps')
|
||||
@ -1 +1 @@
|
||||
= `${t('general.welcome')} ${APPLICATION_NAME}`
|
||||
!= `${t('general.welcome')} ${APPLICATION_NAME}`
|
||||
@ -2,4 +2,4 @@ extend ../layout.pug
|
||||
|
||||
block content
|
||||
.content
|
||||
p= t('removedUserFromGroup', { groupName })
|
||||
p!= t('removedUserFromGroup', { groupName })
|
||||
|
||||
@ -2,8 +2,8 @@ extend ../layout.pug
|
||||
|
||||
block content
|
||||
.content
|
||||
p= t('resetPassword.introduction')
|
||||
a.button(href=actionUrl)= t('buttons.confirmEmail')
|
||||
p= t('resetPassword.ignore')
|
||||
p= t('resetPassword.codeHint')
|
||||
span= nonce
|
||||
p!= t('resetPassword.introduction')
|
||||
a.button(href=actionUrl)!= t('buttons.confirmEmail')
|
||||
p!= t('resetPassword.ignore')
|
||||
p!= t('resetPassword.codeHint')
|
||||
span!= nonce
|
||||
|
||||
@ -1 +1 @@
|
||||
= `${t('subjects.resetPassword')} ${APPLICATION_NAME}`
|
||||
!= `${t('subjects.resetPassword')} ${APPLICATION_NAME}`
|
||||
@ -3,6 +3,6 @@ extend ../layout.pug
|
||||
block content
|
||||
.content
|
||||
p
|
||||
a.user(href=groupRelatedUserUrl)= groupRelatedUserName
|
||||
= t('userJoinedGroup', { groupName })
|
||||
a.button(href=groupUrl)= t('buttons.viewGroup')
|
||||
a.user(href=groupRelatedUserUrl)!= groupRelatedUserName
|
||||
!= t('userJoinedGroup', { groupName })
|
||||
a.button(href=groupUrl)!= t('buttons.viewGroup')
|
||||
|
||||
@ -1 +1 @@
|
||||
= `${APPLICATION_NAME} – ${t('notification')}: ${t('subjects.userJoinedGroup')}`
|
||||
!= `${APPLICATION_NAME} – ${t('notification')}: ${t('subjects.userJoinedGroup')}`
|
||||
@ -3,6 +3,6 @@ extend ../layout.pug
|
||||
block content
|
||||
.content
|
||||
p
|
||||
a.user(href=groupRelatedUserUrl)= groupRelatedUserName
|
||||
= t('userLeftGroup', { groupName })
|
||||
a.button(href=groupUrl)= t('buttons.viewGroup')
|
||||
a.user(href=groupRelatedUserUrl)!= groupRelatedUserName
|
||||
!= t('userLeftGroup', { groupName })
|
||||
a.button(href=groupUrl)!= t('buttons.viewGroup')
|
||||
|
||||
@ -1 +1 @@
|
||||
= `${APPLICATION_NAME} – ${t('notification')}: ${t('subjects.userLeftGroup')}`
|
||||
!= `${APPLICATION_NAME} – ${t('notification')}: ${t('subjects.userLeftGroup')}`
|
||||
@ -2,9 +2,9 @@ extend ../layout.pug
|
||||
|
||||
block content
|
||||
.content
|
||||
p= t('wrongEmail.introduction')
|
||||
a.button(href=actionUrl)= t('buttons.tryAgain')
|
||||
p!= t('wrongEmail.introduction')
|
||||
a.button(href=actionUrl)!= t('buttons.tryAgain')
|
||||
|
||||
p= t('wrongEmail.ignoreStart')
|
||||
a(href=ORGANIZATION_LINK)= APPLICATION_NAME
|
||||
= t('wrongEmail.ignoreEnd')
|
||||
p!= t('wrongEmail.ignoreStart')
|
||||
a(href=ORGANIZATION_LINK)!= APPLICATION_NAME
|
||||
!= t('wrongEmail.ignoreEnd')
|
||||
|
||||
@ -1 +1 @@
|
||||
= `${t('subjects.wrongEmail')} ${APPLICATION_NAME}`
|
||||
!= `${t('subjects.wrongEmail')} ${APPLICATION_NAME}`
|
||||
Loading…
x
Reference in New Issue
Block a user