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
lib/passport.js
View file

@ -2,6 +2,8 @@
let config = require('config');
let log = require('npmlog');
let _ = require('./translate')._;
let util = require('util');
let passport = require('passport');
let LocalStrategy = require('passport-local').Strategy;
@ -33,7 +35,7 @@ module.exports.setup = app => {
module.exports.logout = (req, res) => {
if (req.user) {
req.flash('info', req.user.username + ' logged out');
req.flash('info', util.format(_('%s logged out'), req.user.username));
req.logout();
}
res.redirect('/');
@ -46,7 +48,7 @@ module.exports.login = (req, res, next) => {
return next(err);
}
if (!user) {
req.flash('danger', info && info.message || 'Failed to authenticate user');
req.flash('danger', info && info.message || _('Failed to authenticate user'));
return res.redirect('/users/login' + (req.body.next ? '?next=' + encodeURIComponent(req.body.next) : ''));
}
req.logIn(user, err => {
@ -62,7 +64,7 @@ module.exports.login = (req, res, next) => {
req.session.cookie.expires = false;
}
req.flash('success', 'Logged in as ' + user.username);
req.flash('success', util.format(_('Logged in as %s'), user.username));
return res.redirect(req.body.next || '/');
});
})(req, res, next);
@ -120,7 +122,7 @@ if (config.ldap.enabled && LdapStrategy) {
if (!user) {
return done(null, false, {
message: 'Incorrect username or password'
message: _('Incorrect username or password')
});
}