mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-07-04 17:38:20 +02:00
Merge remote-tracking branch 'origin/master' into socket.io1.x
This commit is contained in:
@@ -35,6 +35,9 @@ var fs = require('fs'),
|
||||
email: async.apply(User.getUserField, uid, 'email'),
|
||||
settings: async.apply(User.getSettings, uid)
|
||||
}, function(err, results) {
|
||||
if (err) {
|
||||
return winston.error('[emailer] Error sending digest : ' + err.stack);
|
||||
}
|
||||
async.map([results.html, results.plaintext, params.subject], function(raw, next) {
|
||||
translator.translate(raw, results.settings.language || meta.config.defaultLang || 'en_GB', function(translated) {
|
||||
next(undefined, translated);
|
||||
|
||||
Reference in New Issue
Block a user