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

48
lib/models/subscriptions.js
View file

@ -10,6 +10,8 @@ let settings = require('./settings');
let mailer = require('../mailer');
let urllib = require('url');
let log = require('npmlog');
let _ = require('../translate')._;
let util = require('util');
module.exports.list = (listId, start, limit, callback) => {
listId = Number(listId) || 0;
@ -83,7 +85,7 @@ module.exports.filter = (listId, request, columns, segmentId, callback) => {
segmentId = Number(segmentId) || 0;
if (!listId) {
return callback(new Error('Missing List ID'));
return callback(new Error(_('Missing List ID')));
}
let processQuery = queryData => {
@ -228,7 +230,7 @@ module.exports.addConfirmation = (list, email, optInIp, data, callback) => {
name: [].concat(data.firstName || []).concat(data.lastName || []).join(' '),
address: email
},
subject: list.name + ': Please Confirm Subscription',
subject: util.format(_('%s: Please Confirm Subscription'),list.name),
encryptionKeys
}, {
html: 'emails/confirm-html.hbs',
@ -319,7 +321,7 @@ module.exports.subscribe = (cid, optInIp, callback) => {
}
if (!result.entryId) {
return callback(new Error('Could not save subscription'));
return callback(new Error(_('Could not save subscription')));
}
db.getConnection((err, connection) => {
@ -502,7 +504,7 @@ module.exports.get = (listId, cid, callback) => {
cid = (cid || '').toString().trim();
if (!cid) {
return callback(new Error('Missing Subbscription ID'));
return callback(new Error(_('Missing Subbscription ID')));
}
db.getConnection((err, connection) => {
@ -532,7 +534,7 @@ module.exports.getById = (listId, id, callback) => {
id = Number(id) || 0;
if (!id) {
return callback(new Error('Missing Subbscription ID'));
return callback(new Error(_('Missing Subbscription ID')));
}
db.getConnection((err, connection) => {
@ -560,7 +562,7 @@ module.exports.getById = (listId, id, callback) => {
module.exports.getByEmail = (listId, email, callback) => {
if (!email) {
return callback(new Error('Missing Subbscription email address'));
return callback(new Error(_('Missing Subbscription email address')));
}
db.getConnection((err, connection) => {
@ -635,11 +637,11 @@ module.exports.update = (listId, cid, updates, allowEmail, callback) => {
let values = [];
if (listId < 1) {
return callback(new Error('Missing List ID'));
return callback(new Error(_('Missing List ID')));
}
if (!cid) {
return callback(new Error('Missing subscription ID'));
return callback(new Error(_('Missing subscription ID')));
}
fields.list(listId, (err, fieldList) => {
@ -698,11 +700,11 @@ module.exports.unsubscribe = (listId, email, campaignId, callback) => {
campaignId = (campaignId || '').toString().trim() || false;
if (listId < 1) {
return callback(new Error('Missing List ID'));
return callback(new Error(_('Missing List ID')));
}
if (!email) {
return callback(new Error('Missing email address'));
return callback(new Error(_('Missing email address')));
}
db.getConnection((err, connection) => {
@ -884,11 +886,11 @@ module.exports.delete = (listId, cid, callback) => {
cid = (cid || '').toString().trim();
if (listId < 1) {
return callback(new Error('Missing List ID'));
return callback(new Error(_('Missing List ID')));
}
if (!cid) {
return callback(new Error('Missing subscription ID'));
return callback(new Error(_('Missing subscription ID')));
}
db.getConnection((err, connection) => {
@ -987,11 +989,11 @@ module.exports.updateImport = (listId, importId, data, callback) => {
importId = Number(importId) || 0;
if (listId < 1) {
return callback(new Error('Missing List ID'));
return callback(new Error(_('Missing List ID')));
}
if (importId < 1) {
return callback(new Error('Missing Import ID'));
return callback(new Error(_('Missing Import ID')));
}
let keys = [];
@ -1041,11 +1043,11 @@ module.exports.getImport = (listId, importId, callback) => {
importId = Number(importId) || 0;
if (listId < 1) {
return callback(new Error('Missing List ID'));
return callback(new Error(_('Missing List ID')));
}
if (importId < 1) {
return callback(new Error('Missing Import ID'));
return callback(new Error(_('Missing Import ID')));
}
db.getConnection((err, connection) => {
@ -1081,7 +1083,7 @@ module.exports.getFailedImports = (importId, callback) => {
importId = Number(importId) || 0;
if (importId < 1) {
return callback(new Error('Missing Import ID'));
return callback(new Error(_('Missing Import ID')));
}
db.getConnection((err, connection) => {
@ -1104,7 +1106,7 @@ module.exports.listImports = (listId, callback) => {
listId = Number(listId) || 0;
if (listId < 1) {
return callback(new Error('Missing List ID'));
return callback(new Error(_('Missing List ID')));
}
db.getConnection((err, connection) => {
@ -1147,11 +1149,11 @@ module.exports.updateAddress = (list, cid, updates, optInIp, callback) => {
let emailNew = (updates.emailNew || '').toString().trim();
if (!list || !list.id) {
return callback(new Error('Missing List ID'));
return callback(new Error(_('Missing List ID')));
}
if (!cid) {
return callback(new Error('Missing subscription ID'));
return callback(new Error(_('Missing subscription ID')));
}
tools.validateEmail(emailNew, false, err => {
@ -1173,12 +1175,12 @@ module.exports.updateAddress = (list, cid, updates, optInIp, callback) => {
}
if (!rows || !rows.length) {
connection.release();
return callback(new Error('Unknown subscription ID'));
return callback(new Error(_('Unknown subscription ID')));
}
if (rows[0].email === emailNew) {
connection.release();
return callback(new Error('Nothing seems to be changed'));
return callback(new Error(_('Nothing seems to be changed')));
}
let old = rows[0];
@ -1192,7 +1194,7 @@ module.exports.updateAddress = (list, cid, updates, optInIp, callback) => {
}
if (rows && rows[0] && rows[0].id) {
return callback(new Error('This address is already registered by someone else'));
return callback(new Error(_('This address is already registered by someone else')));
}
module.exports.addConfirmation(list, emailNew, optInIp, {