feat(ARC-2267): add language prop to send email function #484
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
…o-send-emails-in-user-preferred-language
…o-send-emails-in-user-preferred-language
bertyhell
requested changes
Jul 1, 2024
| @@ -1,17 +1,33 @@ | |||
| import { Template } from './campaign-monitor.types'; | |||
|
|
|||
| export const getTemplateId = (template: string): string => { | |||
| export const getTemplateId = (template: string, language: 'nl' | 'en'): string => { | |||
| console.log(template, language); | |||
| @@ -1,17 +1,33 @@ | |||
| import { Template } from './campaign-monitor.types'; | |||
|
|
|||
| export const getTemplateId = (template: string): string => { | |||
| export const getTemplateId = (template: string, language: 'nl' | 'en'): string => { | |||
There was a problem hiding this comment.
Suggested change
| export const getTemplateId = (template: string, language: 'nl' | 'en'): string => { | |
| export const getTemplateId = (template: string, language: Locale): string => { |
| .CAMPAIGN_MONITOR_TEMPLATE_MATERIAL_REQUEST_MAINTAINER as string, | ||
| [Template.EMAIL_CONFIRMATION]: process.env.CAMPAIGN_MONITOR_TEMPLATE_CONFIRMATION as string, | ||
| [Template.SHARE_FOLDER]: process.env[ | ||
| `CAMPAIGN_MONITOR_EMAIL_TEMPLATE_SHARE_FOLDER__${language.toUpperCase()}` |
There was a problem hiding this comment.
if you change environment variables here, you should also update them in the .env.template file
hetarchief-proxy/.env/.env.template
Line 74 in a55ba46
| @@ -13,6 +13,7 @@ export enum Template { | |||
| MATERIAL_REQUEST_REQUESTER = 'materialRequestRequester', | |||
| MATERIAL_REQUEST_MAINTAINER = 'materialRequestMaintainer', | |||
| EMAIL_CONFIRMATION = 'emailConfirmation', | |||
| CREATE_VISIT_REQUEST = 'createVisitRequest', | |||
There was a problem hiding this comment.
why are you added this one?
Was it missing before?
Because CAMPAIGN_MONITOR_EMAIL_TEMPLATE_CREATE_VISIT_REQUEST_FOR_USER__ sounds like a feature that is out of scope:
Start nieuwe toegangsaanvraag voor gebruiker (als een CP-admin)
| await this.campaignMonitorService.sendTransactionalMail(emailInfo); | ||
| await this.campaignMonitorService.sendTransactionalMail( | ||
| emailInfo, | ||
| user?.getLanguage() || 'nl' |
There was a problem hiding this comment.
Suggested change
| user?.getLanguage() || 'nl' | |
| user?.getLanguage() || Locale.Nl |
| data, | ||
| }, | ||
| language | ||
| ); | ||
| } |
| public async sendTransactionalMail(emailInfo: CampaignMonitorSendMailDto): Promise<void> { | ||
| public async sendTransactionalMail( | ||
| emailInfo: CampaignMonitorSendMailDto, | ||
| lang: 'nl' | 'en' |
There was a problem hiding this comment.
Suggested change
| lang: 'nl' | 'en' | |
| lang: Locale, |
| @@ -281,7 +297,8 @@ export class CampaignMonitorService implements OnApplicationBootstrap { | |||
|
|
|||
| let cmTemplateId: string; | |||
| if (Object.values(Template).includes(emailInfo.template as any)) { | |||
| cmTemplateId = getTemplateId(emailInfo.template); | |||
| cmTemplateId = getTemplateId(emailInfo.template, lang); | |||
| console.log(cmTemplateId); | |||
| template: Template.VISIT_REQUEST_CP, | ||
| visitRequest: visitRequest, | ||
| }, | ||
| user.getLanguage() |
There was a problem hiding this comment.
language is already passed for each recipient. There should be no need to pass this language param
| @@ -236,7 +239,8 @@ export class NotificationsService { | |||
| */ | |||
| public async onApproveVisitRequest( | |||
| visitRequest: VisitRequest, | |||
| space: VisitorSpace | |||
| space: VisitorSpace, | |||
| language: 'en' | 'nl' | |||
There was a problem hiding this comment.
Suggested change
| language: 'en' | 'nl' | |
| language: Locale, |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.