hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

language keys for password changing -- issue #1278

Browse Source
v1.18.x
Julian Lam 11 years ago
parent 1abba25f83
commit bc29f832fe
4 changed files with 47 additions and 34 deletions
Show Stats Download Patch File Download Diff File

6
public/language/en_GB/user.json
Unescape Escape View File

@ -31,6 +31,12 @@
"upload_new_picture": "Upload New Picture", "upload_new_picture": "Upload New Picture",
"current_password": "Current Password", "current_password": "Current Password",
"change_password": "Change Password", "change_password": "Change Password",
"change_password_error": "Invalid Password!",
"change_password_error_wrong_current": "Your current password is not correct!",
"change_password_error_length": "Password too short!",
"change_password_error_match": "Passwords must match!",
"change_password_error_privileges": "You are not have the rights to change this password.",
"change_password_success": "Your password is updated!",
"confirm_password": "Confirm Password", "confirm_password": "Confirm Password",
"password": "Password", "password": "Password",

35
public/src/forum/accountedit.js
Unescape Escape View File

@ -135,20 +135,24 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
}); });
function showError(element, msg) { function showError(element, msg) {
element.html(msg); translator.translate(msg, function(msg) {
element.parent() element.html(msg);
.removeClass('alert-success') element.parent()
.addClass('alert-danger'); .removeClass('alert-success')
element.show(); .addClass('alert-danger');
validationError = true; element.show();
validationError = true;
});
} }
function showSuccess(element, msg) { function showSuccess(element, msg) {
element.html(msg); translator.translate(msg, function(msg) {
element.parent() element.html(msg);
.removeClass('alert-danger') element.parent()
.addClass('alert-success'); .removeClass('alert-danger')
element.show(); .addClass('alert-success');
element.show();
});
} }
(function handlePasswordChange() { (function handlePasswordChange() {
@ -165,9 +169,9 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
function onPasswordChanged() { function onPasswordChanged() {
passwordvalid = utils.isPasswordValid(password.val()); passwordvalid = utils.isPasswordValid(password.val());
if (password.val().length < config.minimumPasswordLength) { if (password.val().length < config.minimumPasswordLength) {
showError(password_notify, 'Password too short!'); showError(password_notify, '[[user:change_password_error_length]]');
} else if (!passwordvalid) { } else if (!passwordvalid) {
showError(password_notify, 'Invalid password!'); showError(password_notify, '[[user:change_password_error]]');
} else { } else {
showSuccess(password_notify, successIcon); showSuccess(password_notify, successIcon);
} }
@ -176,7 +180,7 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
function onPasswordConfirmChanged() { function onPasswordConfirmChanged() {
if(password.val()) { if(password.val()) {
if (password.val() !== password_confirm.val()) { if (password.val() !== password_confirm.val()) {
showError(password_confirm_notify, 'Passwords must match!') showError(password_confirm_notify, '[[user:change_password_error_match]]')
passwordsmatch = false; passwordsmatch = false;
} else { } else {
showSuccess(password_confirm_notify, successIcon); showSuccess(password_confirm_notify, successIcon);
@ -195,7 +199,6 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
'newPassword': password.val(), 'newPassword': password.val(),
'uid': ajaxify.variables.get('theirid') 'uid': ajaxify.variables.get('theirid')
}, function(err) { }, function(err) {
currentPassword.val(''); currentPassword.val('');
password.val(''); password.val('');
password_confirm.val(''); password_confirm.val('');
@ -206,7 +209,7 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
return app.alertError(err.message); return app.alertError(err.message);
} }
app.alertSuccess('Your password is updated!'); app.alertSuccess('[[user:change_password_success]]');
}); });
} }
return false; return false;

34
public/src/forum/register.js
Unescape Escape View File

@ -9,20 +9,24 @@ define(function() {
successIcon = '<i class="fa fa-check"></i>'; successIcon = '<i class="fa fa-check"></i>';
function showError(element, msg) { function showError(element, msg) {
element.html(msg); translator.translate(msg, function(msg) {
element.parent() element.html(msg);
.removeClass('alert-success') element.parent()
.addClass('alert-danger'); .removeClass('alert-success')
element.show(); .addClass('alert-danger');
validationError = true; element.show();
validationError = true;
});
} }
function showSuccess(element, msg) { function showSuccess(element, msg) {
element.html(msg); translator.translate(msg, function(msg) {
element.parent() element.html(msg);
.removeClass('alert-danger') element.parent()
.addClass('alert-success'); .removeClass('alert-danger')
element.show(); .addClass('alert-success');
element.show();
});
} }
function validateEmail(email) { function validateEmail(email) {
@ -93,15 +97,15 @@ define(function() {
password_confirm_notify = $('#password-confirm-notify'); password_confirm_notify = $('#password-confirm-notify');
if (password.length < config.minimumPasswordLength) { if (password.length < config.minimumPasswordLength) {
showError(password_notify, 'Password too short!'); showError(password_notify, '[[user:change_password_error_length]]');
} else if (!utils.isPasswordValid(password)) { } else if (!utils.isPasswordValid(password)) {
showError(password_notify, 'Invalid password!'); showError(password_notify, '[[user:change_password_error_]]');
} else { } else {
showSuccess(password_notify, successIcon); showSuccess(password_notify, successIcon);
} }
if (password !== password_confirm && password_confirm !== '') { if (password !== password_confirm && password_confirm !== '') {
showError(password_confirm_notify, 'Passwords must match!'); showError(password_confirm_notify, '[[user:change_password_error_match]]');
} }
} }
@ -114,7 +118,7 @@ define(function() {
} }
if (password !== password_confirm) { if (password !== password_confirm) {
showError(password_confirm_notify, 'Passwords must match!'); showError(password_confirm_notify, '[[user:change_password_error_match]]');
} else { } else {
showSuccess(password_confirm_notify, successIcon); showSuccess(password_confirm_notify, successIcon);
} }

6
src/user/profile.js
Unescape Escape View File

@ -222,13 +222,13 @@ module.exports = function(User) {
} }
if (!utils.isPasswordValid(data.newPassword)) { 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)) { if(parseInt(uid, 10) !== parseInt(data.uid, 10)) {
User.isAdministrator(uid, function(err, isAdmin) { User.isAdministrator(uid, function(err, isAdmin) {
if(err || !isAdmin) { if(err || !isAdmin) {
return callback(err || new Error('not-allowed')); return callback(err || new Error('[[user:change_password_error_privileges'));
} }
hashAndSetPassword(callback); hashAndSetPassword(callback);
@ -245,7 +245,7 @@ module.exports = function(User) {
bcrypt.compare(data.currentPassword, currentPassword, function(err, res) { bcrypt.compare(data.currentPassword, currentPassword, function(err, res) {
if (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); hashAndSetPassword(callback);
}); });

Write Preview
Loading…
Cancel
Save