Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-28 10:19:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

language keys for password changing -- issue #1278

Browse Source
This commit is contained in:
Julian Lam
2014-04-01 21:41:54 -04:00
parent 1abba25f83
commit bc29f832fe
4 changed files with 47 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/user/profile.js
View File

@@ -222,13 +222,13 @@ module.exports = function(User) {
}
if (!utils.isPasswordValid(data.newPassword)) {
return callback(new Error('Invalid password!'));
return callback(new Error('[[user:change_password_error]]'));
}
if(parseInt(uid, 10) !== parseInt(data.uid, 10)) {
User.isAdministrator(uid, function(err, isAdmin) {
if(err || !isAdmin) {
return callback(err || new Error('not-allowed'));
return callback(err || new Error('[[user:change_password_error_privileges'));
}
hashAndSetPassword(callback);
@@ -245,7 +245,7 @@ module.exports = function(User) {
bcrypt.compare(data.currentPassword, currentPassword, function(err, res) {
if (err || !res) {
return callback(err || new Error('Your current password is not correct!'));
return callback(err || new Error('[[user:change_password_error_wrong_current]]'));
}
hashAndSetPassword(callback);
});