Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 19:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #2531

Browse Source
This commit is contained in:
barisusakli
2014-12-21 14:14:46 -05:00
parent e22c13abd4
commit e6b4a45cda
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/language/en_GB/error.json
View File

@@ -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",

2
public/src/app.js
View File

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

2
src/socket.io/modules.js
View File

@@ -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) {