Misleading message in UCP when no permission to change password

If a user does not have permission to change his password, the Edit account settings dialog contains only a Current password box, and not also a Confirm password box. This is as it should be. However, the explanatory message by the Current password box says:

"You must confirm your current password if you wish to change it, alter your e-mail address or username."

See second attachment

This is misleading in two respects. First, it implies that the user can change his password when he can't. Second, when a user DOES have permission to change his password, there is also a Confirm password box with an explanatory message saying:

"You only need to confirm your password if you changed it above."

See first attachment

This creates confusion as to where you need to enter your password, since the word "confirm" appears in both messages.

I think the fix would be to alter the existing CURRENT_PASSWORD_EXPLAIN language entry in language/ucp.php, like this:

'CURRENT_PASSWORD_EXPLAIN' => 'You must enter your current password if you wish to alter your e-mail address or username.',

And then create an additional language entry in language/ucp.php, like this:

'CURRENT_CHANGE_PASSWORD_EXPLAIN' => 'You must enter your current password if you wish to change it, alter your e-mail address or username.',

Then, in styles/*/template/ucp_profile_reg_details.html,

Change this:

<dt><label for="cur_password">

{L_CURRENT_PASSWORD}:</label><br /><span>{L_CURRENT_PASSWORD_EXPLAIN}</span></dt>

To this:


<dt><label for="cur_password">{L_CURRENT_PASSWORD}

:</label><br /><span><!-- IF S_CHANGE_PASSWORD -->

{L_CURRENT_CHANGE_PASSWORD_EXPLAIN}

<!-- ELSE -->

{L_CURRENT_PASSWORD_EXPLAIN}

<!-- ENDIF --></span></dt>