diff --git a/public/language/en_GB/error.json b/public/language/en_GB/error.json index 40b685354d..4efb4cd52f 100644 --- a/public/language/en_GB/error.json +++ b/public/language/en_GB/error.json @@ -23,6 +23,7 @@ "username-taken": "Username 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-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Username too short", "username-too-long": "Username too long", diff --git a/public/src/app.js b/public/src/app.js index 5e3b8ba76d..cc58f0e32f 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -170,7 +170,7 @@ app.uid = null; title: '[[global:alert.error]]', message: message, type: 'danger', - timeout: timeout ? timeout : 2000 + timeout: timeout ? timeout : 5000 }); }; diff --git a/src/socket.io/modules.js b/src/socket.io/modules.js index 67357484cf..a922613ac3 100644 --- a/src/socket.io/modules.js +++ b/src/socket.io/modules.js @@ -159,7 +159,7 @@ SocketModules.chats.send = function(socket, data, callback) { } 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) {