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

closes #2465

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2015-03-11 13:25:48 -04:00
parent eb733fdb6f
commit abd3979fb3
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +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", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
"no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
"email-confirm-failed": "We could not confirm your email, please try again later.", "email-confirm-failed": "We could not confirm your email, please try again later.",

3
public/src/client/chats.js
View File

@@ -206,6 +206,9 @@ define('forum/chats', ['string', 'sounds', 'forum/infinitescroll'], function(S,
message:msg message:msg
}, function(err) { }, function(err) {
if (err) { if (err) {
if (err.message === '[[error:email-not-confirmed-chat]]') {
return showEmailConfirmAlert(err);
}
return app.alertError(err.message); return app.alertError(err.message);
} }