v1.18.x
barisusakli 10 years ago
parent e22c13abd4
commit e6b4a45cda

@ -23,6 +23,7 @@
"username-taken": "Username taken", "username-taken": "Username taken",
"email-taken": "Email taken", "email-taken": "Email taken",
"email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.",
"email-not-confirmed-chat": "You are unable to chat until your email is confirmed",
"username-too-short": "Username too short", "username-too-short": "Username too short",
"username-too-long": "Username too long", "username-too-long": "Username too long",

@ -170,7 +170,7 @@ app.uid = null;
title: '[[global:alert.error]]', title: '[[global:alert.error]]',
message: message, message: message,
type: 'danger', type: 'danger',
timeout: timeout ? timeout : 2000 timeout: timeout ? timeout : 5000
}); });
}; };

@ -159,7 +159,7 @@ SocketModules.chats.send = function(socket, data, callback) {
} }
if (parseInt(meta.config.requireEmailConfirmation, 10) === 1 && parseInt(userData['email:confirmed'], 10) !== 1) { if (parseInt(meta.config.requireEmailConfirmation, 10) === 1 && parseInt(userData['email:confirmed'], 10) !== 1) {
return callback(new Error('[[error:email-not-confirmed]]')); return callback(new Error('[[error:email-not-confirmed-chat]]'));
} }
Messaging.canMessage(socket.uid, touid, function(err, allowed) { Messaging.canMessage(socket.uid, touid, function(err, allowed) {

Loading…
Cancel
Save