public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Updated translation support

Browse source
This commit is contained in:
Andris Reinman 2017-03-07 16:30:56 +02:00
parent b1e8cd68cd
commit d25565b6f8
114 changed files with 42095 additions and 1902 deletions
Download patch file Download diff file Expand all files Collapse all files

10
services/feedcheck.js
View file

@ -6,6 +6,8 @@ let db = require('../lib/db');
let tools = require('../lib/tools');
let feed = require('../lib/feed');
let campaigns = require('../lib/models/campaigns');
let _ = require('../lib/translate')._;
let util = require('util');
const feed_timeout = 15 * 1000;
const rss_timeout = 1 * 1000;
@ -46,12 +48,12 @@ function feedLoop() {
let message;
if (err) {
log.error('Feed', err);
message = 'Feed error: ' + err.message;
message = util.format(_('Feed error: %s'), err.message);
} else if (result) {
log.verbose('Feed', 'Added %s new campaigns for %s', result, parent.id);
message = 'Found ' + result + ' new campaign messages from feed';
message = util.format(_('Found %s new campaign messages from feed'), result);
} else {
message = 'Found nothing new from the feed';
message = _('Found nothing new from the feed');
}
return updateRssInfo(parent.id, false, message, () => {
setTimeout(feedLoop, rss_timeout);
@ -138,7 +140,7 @@ function checkEntries(parent, entries, callback) {
let campaign = {
type: 'entry',
name: entry.title || 'RSS entry ' + (entry.guid.substr(0, 67)),
name: entry.title || util.format(_('RSS entry %s'), entry.guid.substr(0, 67)),
from: parent.from,
address: parent.address,
subject: entry.title || parent.subject,

3
services/importer.js
View file

@ -4,6 +4,7 @@ let log = require('npmlog');
let db = require('../lib/db');
let tools = require('../lib/tools');
let _ = require('../lib/translate')._;
let fields = require('../lib/models/fields');
let subscriptions = require('../lib/models/subscriptions');
@ -239,7 +240,7 @@ let importLoop = () => {
let failed = null;
if (err) {
if (err.code === 'ENOENT') {
failed = 'Could not access import file';
failed = _('Could not access import file');
} else {
failed = err.message || err;
}

8
services/sender.js
View file

@ -16,6 +16,8 @@ let url = require('url');
let htmlToText = require('html-to-text');
let request = require('request');
let libmime = require('libmime');
let _ = require('../lib/translate')._;
let util = require('util');
let attachmentCache = new Map();
let attachmentCacheSize = 0;
@ -299,14 +301,14 @@ function formatMessage(message, callback) {
return callback(err);
}
if (!campaign) {
return callback(new Error('Campaign not found'));
return callback(new Error(_('Campaign not found')));
}
lists.get(message.listId, (err, list) => {
if (err) {
return callback(err);
}
if (!list) {
return callback(new Error('List not found'));
return callback(new Error(_('List not found')));
}
settings.list(['serviceUrl', 'verpUse', 'verpHostname'], (err, configItems) => {
@ -442,7 +444,7 @@ function formatMessage(message, callback) {
return callback(err);
}
if (httpResponse.statusCode !== 200) {
return callback(new Error('Received status code ' + httpResponse.statusCode + ' from ' + campaign.sourceUrl));
return callback(new Error(util.format(_('Received status code %s from %s'), httpResponse.statusCode, campaign.sourceUrl)));
}
renderAndSend(body && body.toString(), '', false);
});

4
services/triggers.js
View file

@ -4,6 +4,8 @@ let log = require('npmlog');
let db = require('../lib/db');
let tools = require('../lib/tools');
let triggers = require('../lib/models/triggers');
let _ = require('../lib/translate')._;
let util = require('util');
function triggerLoop() {
checkTrigger((err, triggerId) => {
@ -46,7 +48,7 @@ function checkTrigger(callback) {
return callback(err);
}
if (!query) {
return callback(new Error('Unknown trigger type ' + trigger.id));
return callback(new Error(util.format(_('Unknown trigger type %s'), trigger.id)));
}
trigger.query = query;
fireTrigger(trigger, callback);