Index: core/install/english.lang =================================================================== --- core/install/english.lang (revision 13009) +++ core/install/english.lang (working copy) @@ -973,6 +973,8 @@ KEdNVCArMDk6MDAp UGFkZGluZ3M= UGFnZQ== + UGFzc3dvcmRzIGRvIG5vdCBtYXRjaA== + UGFzc3dvcmQgaXMgdG9vIHNob3J0LCBwbGVhc2UgZW50ZXIgYXQgbGVhc3QgJXMgY2hhcmFjdGVycw== UGVuZGluZw== UGVyZm9ybWluZyBCYWNrdXA= UGVyZm9ybWluZyBJbXBvcnQ= Index: core/kernel/utility/formatters/password_formatter.php =================================================================== --- core/kernel/utility/formatters/password_formatter.php (revision 13001) +++ core/kernel/utility/formatters/password_formatter.php (working copy) @@ -95,16 +95,18 @@ return $value; } } + + // determine admin or front + $phrase_error_prefix = $this->Application->isAdmin ? 'la' : 'lu'; if ($new_password != $verify_password) { - // passwords don't match (no matter what is their length) - $object->SetError($verify_field, 'passwords_do_not_match', 'lu_passwords_do_not_match'); + // passwords don't match (no matter what is their length) + $object->SetError($verify_field, 'passwords_do_not_match', $phrase_error_prefix.'_passwords_do_not_match'); } $min_length = $this->Application->ConfigValue('Min_Password'); // for error message too - - if (mb_strlen($new_password) < $min_length) { - $error_msg = '+' . sprintf($this->Application->Phrase('lu_passwords_too_short'), $min_length); // + -> not phrase + if (mb_strlen($new_password) < $min_length) { + $error_msg = '+' . sprintf($this->Application->Phrase($phrase_error_prefix.'_passwords_too_short'), $min_length); // + -> not phrase $object->SetError($password_field, 'passwords_min_length', $error_msg); } }