diff --git a/lib/emailservice.js b/lib/emailservice.js index ac4ef26..93e8bc4 100644 --- a/lib/emailservice.js +++ b/lib/emailservice.js @@ -3,6 +3,7 @@ var _ = require('lodash'); var $ = require('preconditions').singleton(); var async = require('async'); +var Mustache = require('mustache'); var log = require('npmlog'); log.debug = log.verbose; var fs = require('fs'); @@ -98,8 +99,8 @@ EmailService.prototype._readTemplate = function(filename, cb) { } var lines = template.split('\n'); return cb(null, { - subject: _.template(lines[0]), - body: _.template(_.rest(lines).join('\n')), + subject: lines[0], + body: _.rest(lines).join('\n'), }); }); }; @@ -107,7 +108,7 @@ EmailService.prototype._readTemplate = function(filename, cb) { EmailService.prototype._applyTemplate = function(template, data, cb) { var result = _.mapValues(template, function(t) { try { - return t(data); + return Mustache.render(t, data); } catch (e) { log.error('Could not apply data to template', e); return cb(e); diff --git a/lib/templates/new_copayer.plain b/lib/templates/new_copayer.plain index 2cc1e53..0a9cc69 100644 --- a/lib/templates/new_copayer.plain +++ b/lib/templates/new_copayer.plain @@ -1,2 +1,2 @@ -<%= subjectPrefix %>New copayer -A new copayer just joined your wallet <%= walletName %>. +{{subjectPrefix}}New copayer +A new copayer just joined your wallet {{walletName}}. diff --git a/lib/templates/new_incoming_tx.plain b/lib/templates/new_incoming_tx.plain index 498b75b..4acc0c1 100644 --- a/lib/templates/new_incoming_tx.plain +++ b/lib/templates/new_incoming_tx.plain @@ -1,2 +1,2 @@ -<%= subjectPrefix %>New payment received -A payment of <%= amount %> has been received into your wallet <%= walletName %>. +{{subjectPrefix}}New payment received +A payment of {{amount}} has been received into your wallet {{walletName}}. diff --git a/lib/templates/new_outgoing_tx.plain b/lib/templates/new_outgoing_tx.plain index 38ece4f..c8f92cb 100644 --- a/lib/templates/new_outgoing_tx.plain +++ b/lib/templates/new_outgoing_tx.plain @@ -1,2 +1,2 @@ -<%= subjectPrefix %>Payment sent -A Payment of <%= amount %> has been sent from your wallet <%= walletName %>. +{{subjectPrefix}}Payment sent +A Payment of {{amount}} has been sent from your wallet {{walletName}}. diff --git a/lib/templates/new_tx_proposal.plain b/lib/templates/new_tx_proposal.plain index e4a9fc9..fee4cc8 100644 --- a/lib/templates/new_tx_proposal.plain +++ b/lib/templates/new_tx_proposal.plain @@ -1,2 +1,2 @@ -<%= subjectPrefix %>New payment proposal -A new payment proposal has been created in your wallet <%= walletName %> by <%= creatorName %>. +{{subjectPrefix}}New payment proposal +A new payment proposal has been created in your wallet {{walletName}} by {{creatorName}}. diff --git a/lib/templates/txp_finally_rejected.plain b/lib/templates/txp_finally_rejected.plain index 80a3fb1..8c765e1 100644 --- a/lib/templates/txp_finally_rejected.plain +++ b/lib/templates/txp_finally_rejected.plain @@ -1,2 +1,2 @@ -<%= subjectPrefix %>Payment proposal rejected -A payment proposal in your wallet <%= walletName %> has been rejected by <%= creatorName %>. +{{subjectPrefix}}Payment proposal rejected +A payment proposal in your wallet {{walletName}} has been rejected by {{creatorName}}. diff --git a/lib/templates/wallet_complete.plain b/lib/templates/wallet_complete.plain index ba52e3e..e18902a 100644 --- a/lib/templates/wallet_complete.plain +++ b/lib/templates/wallet_complete.plain @@ -1,2 +1,2 @@ -<%= subjectPrefix %>Wallet complete -Your wallet <%= walletName %> is complete. +{{subjectPrefix}}Wallet complete +Your wallet {{walletName}} is complete.