verdnatura-mirror
/
loopback
mirror of https://github.com/strongloop/loopback.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply g.f to literal strings 

[back-port of #2684]
This commit is contained in:
Setogit 2016-08-27 22:42:21 -07:00 committed by Simon Ho
parent 33adf256ab
commit 77364a93f0
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/models/user.js
View File

@ -436,25 +436,20 @@ module.exports = function(User) {
function sendEmail(user) { function sendEmail(user) {
options.verifyHref += '&token=' + user.verificationToken; options.verifyHref += '&token=' + user.verificationToken;
options.text = options.text || 'Please verify your email by opening this link in a web browser:\n\t{href}'; options.text = options.text || g.f('Please verify your email by opening ' +
'this link in a web browser:\n\t%s', options.verifyHref);
options.text = options.text.replace(/\{href\}/g, options.verifyHref); options.text = options.text.replace(/\{href\}/g, options.verifyHref);
options.text = g.f(options.text);
options.to = options.to || user.email; options.to = options.to || user.email;
options.subject = options.subject || 'Thanks for Registering'; options.subject = options.subject || g.f('Thanks for Registering');
options.subject = g.f(options.subject);
options.headers = options.headers || {}; options.headers = options.headers || {};
var template = loopback.template(options.template); var template = loopback.template(options.template);
options.html = template(options); options.html = template(options);
options.html = g.f(options.html);
Email.send(options, function(err, email) { Email.send(options, function(err, email) {
if (err) { if (err) {
fn(err); fn(err);