hiro/Vulcan
1
0
Fork 0
mirror of https://github.com/vale981/Vulcan synced 2025-03-06 01:51:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add Strings object to email data, add locale support to emails

Browse source
This commit is contained in:
SachaG 2018-05-10 09:22:24 +09:00
parent 6a30f44adf
commit 00b2a159c1
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
packages/vulcan-email/lib/server/email.js
View file

@ -3,7 +3,7 @@ import VulcanEmail from '../namespace.js';
import Juice from 'juice';
import htmlToText from 'html-to-text';
import Handlebars from 'handlebars';
import { Utils, getSetting, registerSetting, runQuery } from 'meteor/vulcan:lib'; // import from vulcan:lib because vulcan:core is not loaded yet
import { Utils, getSetting, registerSetting, runQuery, Strings } from 'meteor/vulcan:lib'; // import from vulcan:lib because vulcan:core is not loaded yet
registerSetting('secondaryColor', '#444444');
registerSetting('accentColor', '#DD3416');
@ -28,7 +28,7 @@ VulcanEmail.getTemplate = templateName => Handlebars.compile(
{ noEscape: true, strict: true}
);
VulcanEmail.buildTemplate = (htmlContent, optionalProperties = {}) => {
VulcanEmail.buildTemplate = (htmlContent, optionalProperties = {}, locale) => {
const emailProperties = {
secondaryColor: getSetting('secondaryColor', '#444444'),
@ -43,7 +43,7 @@ VulcanEmail.buildTemplate = (htmlContent, optionalProperties = {}) => {
logoUrl: getSetting('logoUrl'),
logoHeight: getSetting('logoHeight'),
logoWidth: getSetting('logoWidth'),
...optionalProperties
...optionalProperties,
};
const emailHTML = VulcanEmail.getTemplate("wrapper")(emailProperties);
@ -112,24 +112,26 @@ VulcanEmail.send = (to, subject, html, text, throwErrors) => {
};
VulcanEmail.build = async ({ emailName, variables }) => {
VulcanEmail.build = async ({ emailName, variables, locale }) => {
// execute email's GraphQL query
const email = VulcanEmail.emails[emailName];
const result = email.query ? await runQuery(email.query, variables) : {data: {}};
const result = email.query ? await runQuery(email.query, variables, { locale }) : {data: {}};
// if email has a data() function, merge its return value with results from the query
const data = email.data ? {...result.data, ...email.data(variables)} : result.data;
const subject = typeof email.subject === 'function' ? email.subject(data) : email.subject;
const html = VulcanEmail.buildTemplate(VulcanEmail.getTemplate(email.template)(data), data);
data.Strings = Strings[locale];
const html = VulcanEmail.buildTemplate(VulcanEmail.getTemplate(email.template)(data), data, locale);
return { data, subject, html };
}
VulcanEmail.buildAndSend = async ({ to, emailName, variables }) => {
VulcanEmail.buildAndSend = async ({ to, emailName, variables, locale = getSetting('locale') }) => {
const email = await VulcanEmail.build({ to, emailName, variables });
const email = await VulcanEmail.build({ to, emailName, variables, locale });
return VulcanEmail.send(to, email.subject, email.html);
};

8
packages/vulcan-email/lib/server/routes.js
View file

@ -1,5 +1,5 @@
import { Picker } from 'meteor/meteorhacks:picker';
import { runQuery } from 'meteor/vulcan:lib';
import { runQuery, Strings, getSetting } from 'meteor/vulcan:lib';
import VulcanEmail from '../namespace.js';
Meteor.startup(function () {
@ -28,12 +28,18 @@ Meteor.startup(function () {
const emailTestData = email.data ? {...result.data, ...email.data(variables)} : result.data;
const subject = typeof email.subject === 'function' ? email.subject(emailTestData) : email.subject;
const locale = params.query.locale || getSetting('locale');
emailTestData.__ = Strings[locale];
const template = VulcanEmail.getTemplate(email.template);
const htmlContent = template(emailTestData)
// then apply email template to properties, and wrap it with buildTemplate
html = VulcanEmail.buildTemplate(htmlContent, emailTestData);
// remove Strings object to avoid echoing it out
delete emailTestData.__;
html += `
<h4 style="margin: 20px;"><code>Subject: ${subject}</code></h4>
<div style="border: 1px solid #999; padding: 10px 20px; margin: 20px;">