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

Upgrade of modules and webpack.

Browse source 
Support for localization in progress.
This commit is contained in:
Tomas Bures 2018-11-17 23:26:45 +01:00
parent d8b56fff0d
commit 4862d6cac4
52 changed files with 5870 additions and 23064 deletions
Download patch file Download diff file Expand all files Collapse all files

6
services/feedcheck.js
View file

@ -8,7 +8,7 @@ const util = require('util');
const campaigns = require('../models/campaigns');
const contextHelpers = require('../lib/context-helpers');
const _ = require('../lib/translate')._;
const { tLog } = require('../lib/translate');
const feedCheckInterval = 10 * 60 * 1000;
@ -127,14 +127,14 @@ async function run() {
}
if (added > 0) {
checkStatus = util.format(_('Found %s new campaign messages from feed %s'), added, rssCampaign.id);
checkStatus = tLog('feedCheck.campaignsAdded', {addedMessages: added, campaignId: rssCampaign.id});
log.verbose('Feed', `Found ${added} new campaigns messages from feed ${rssCampaign.id}`);
process.send({
type: 'entries-added'
});
} else {
checkStatus = _('Found nothing new from the feed');
checkStatus = tLog('feedCheck.nothingNew');
}
rssCampaign.data.checkStatus = checkStatus;

8
services/importer.js
View file

@ -13,7 +13,7 @@ const { cleanupFromPost, enforce } = require('../lib/helpers');
const contextHelpers = require('../lib/context-helpers');
const tools = require('../lib/tools');
const shares = require('../models/shares');
const _ = require('../lib/translate')._;
const { tLog } = require('../lib/translate');
const csvparse = require('csv-parse');
@ -252,7 +252,7 @@ async function _execImportRun(impt, handlers) {
finished: new Date()
});
throw new Error(_('Last run failed'));
throw new Error('Last run failed');
}
}
@ -292,7 +292,7 @@ async function basicSubscribe(impt) {
let errorMsg;
if (!email) {
errorMsg = _('Missing email');
errorMsg = tLog('importer.missingEmail');
}
if (mappingSettings.checkEmails) {
@ -329,7 +329,7 @@ async function basicUnsubscribe(impt) {
let errorMsg;
if (!email) {
errorMsg = _('Missing email');
errorMsg = tLog('importer.missingEmail');
}
if (!errorMsg) {