Hard to translate: "Required if you want to change the %mail or %pass below."

Confirming.

The logic in this form is pretty crusty and hard to follow:

    // The user may only change their own password without their current
    // password if they logged in via a one-time login link.
    if (!$pass_reset) {
      $protected_values['mail'] = $form['account']['mail']['#title'];
      $protected_values['pass'] = t('Password');
      $request_new = l(t('Request new password'), 'user/password', array('attributes' => array('title' => t('Request new password via e-mail.'))));
      $current_pass_description = t('Enter your current password to change the %mail or %pass. !request_new.', array('%mail' => $protected_values['mail'], '%pass' => $protected_values['pass'], '!request_new' => $request_new));
    }

$protected_values appears to be some magic needed for the form to work securely, but WTF is with reaching back into it to get strings for a title?

Could do with input from someone who understands how this works before I wade in and make a patch.

Also, how are you finding this one:

form_set_error('current_pass', t("Your current password is missing or incorrect; it's required to change the %name.", array('%name' => $name)));

It's probably not clear from what you get as a translator that %name can be either 'password' or 'e-mail address' as above.

Here's a patch for the original bit.

I suspect the 'Your current password is missing or incorrect....' bit will need some work too as it has the same problem; might have to split it into two separate strings and forego the clever reuse, as by the sound of it it will fail on languages that need to alter nouns.

I think a follow-on issue is needed to clean up the confusing logic and badly-worded comments, as it took me over half an hour to understand what this form is doing.

@joachim: Why are the mail and pass variables still in the t() function if they are not being used? Also, neither should be capitalized.

Once that is fixed, it should be good.

+++ modules/user/user.module	17 Nov 2010 11:28:14 -0000
@@ -994,7 +994,7 @@ function user_account_form(&$form, &$for
       $protected_values['pass'] = t('Password');

Do you mean this line? This is kinda crack, but it's used by the validation further down. I agree it needs cleaning up, but it's out of the scope of this patch.

Powered by Dreditor.

@joachim: No, I mean

+ $current_pass_description = t('Enter your current password to change the <em>E-mail address</em> or <em>Password</em>. !request_new.', array('%mail' => $protected_values['mail'], '%pass' => $protected_values['pass'], '!request_new' => $request_new));

The first two parameters in the t() function aren't being used anymore, so I don't think they need to be included in it (I know that they need to be set earlier). And the words with which they have been replaced need to be lowercase.

Re-rolling patch from #3 with EvanDonovan's suggestions. Also pulled $request_new out of t(). Moving this to 8.x because of string freeze.

Re-rolled after #22336: Move all core Drupal files under a /core folder to improve usability and upgrades core directory structure for Drupal 8 was changed.

Re-rolling #8.

You shouldn't pull $request_new out of t(). Other languages might want to put that bit at a different place than at the end (RTL languages, for instance).

Sorry, didn't want to change version.

@tstoeckler But $request_new has already been run through t(). Doesn't running it through twice cause problems?

As it currently stands $request_new is added to the string as a !placeholder, which aren't translated in themselves. Another form, which I would personally like even better, is to inline the link in the t() such as:
Required if you want to change the <em>e-mail address</em> or <em>password</em> below. <a href="@url" title="Request new password via e-mail.">Request new password</a>
That would be a change from the current method, though.

But $request_new is uses l() and t() itself, so it seems like it would run the "Request new password." string through t() first in l() and then again in another t().

No it doesn't! t() doesn't translate %arguments, @arguments, or !arguments. That would make no sense. :)

OH! I see! I'm sorry I was being so dense. I'll re-roll it with the !placeholder included in the t().

On second thought, I'll use your suggestion in #14. Patch forthcoming.

Re-rolled patch with suggestion from #14.

Forgot to change status to needs review.

Thanks for sticking with this. I'm sorry that I have to set this to "needs work" once more.

+++ b/core/modules/user/user.module
@@ -988,8 +988,7 @@ function user_account_form(&$form, &$form_state) {
+      $current_pass_description = t('Required if you want to change the <em>e-mail address</em> or <em>password</em> below. <a href="@request_url" title="Request new password via e-mail.">Request new password.</a>', array('@request_url' => 'user/password'));

You should call url() on 'user/password'. l() does that automatically, that's why it wasn't needed before.

8 days to next Drupal core point release.

@tstoeckler no problem. Thanks for the fix. I was struggling with that part and gave it my best shot. Patch re-rolled here.

I was about to mark this RTBC, but upon looking at it one time I stumbled on the '< em >' part. Before we were using the titles of the form elements, i.e. 'Password' and 'E-mail address' in the < em >. The patch removes that capitalization, but leaves the < em > which now doesn't really reference those form elements anymore. So should we remove the < em > as well, or re-capitalize the two (or neither)? I'm leaning towards the former, but not sure.

Also removing "string freeze" tag, as this will not go into D7 anymore.

#22: user-change-password-973772-22.patch queued for re-testing.

I tested this on 9.2.x and the string Enter your current password to change the %mail or %pass. does not exist in the code base nor in 8.9.x. It was replaced with Your current password is missing or incorrect; it's required to change the %name.in #2418119: REST user updates bypass tightened user account change validation in March 2015. The new string is easier to translate (looking at the Italian translation right now).

Since the string still exists in D7 moving to the Drupal 7 issue queue.

Actually, Your current password is missing or incorrect; it's required to change the %name. is not easier to translate, not even in Italian.

In Italian, the translation of Your current password is missing or incorrect; it's required to change the email. is La tua password corrente è mancante o errata; è necessaria per modificare l'email. The translation of Your current password is missing or incorrect; it's required to change the password. is La tua password corrente è mancante o errata; è necessaria per modificare la password.

In Russian, the translation for Your current password is missing or incorrect; it's required to change the %name. Your current password is missing or incorrect; it's required to change the email. Your current password is missing or incorrect; it's required to change the password. are the following.

• Ваш текущий пароль отсутствует или неверен; необходимо изменить %name.
• Ваш текущий пароль отсутствует или неверен; необходимо изменить электронную почту.
• Ваш текущий пароль отсутствует или неверен; требуется сменить пароль.

Also in this case, the sentence changes basing on what replaces %name.

There is some confusion here. I was referring to the string in the issue summary. The string in the issue summary is "Enter your current password to change the %mail or %pass. !request_new." That string was changed in core 2011, #1326172: Improve wording of the "Current password" field description on the user edit form, to "Required if you want to change the %mail or %pass below". That string is still in core.

The string in #36, is different from those two. The string in #36 added in 2010 in [#8629]. So, I think that should be a separate issue.

The Needs Review Queue Bot tested this issue.

While you are making the above changes, we recommend that you convert this patch to a merge request. Merge requests are preferred over patches. Be sure to hide the old patch files as well. (Converting an issue to a merge request without other contributions to the issue will not receive credit.)

My comment was a reply to comment #35, which says:

I tested this on 9.2.x and the string Enter your current password to change the %mail or %pass. does not exist in the code base nor in 8.9.x. It was replaced with Your current password is missing or incorrect; it's required to change the %name.in #2418119: REST user updates bypass tightened user account change validation in March 2015. The new string is easier to translate (looking at the Italian translation right now).

Since the string still exists in D7 moving to the Drupal 7 issue queue.

I did not check which string was actually used, but that comment said the string used in Drupal 7 was replaced from Your current password is missing or incorrect; it's required to change the %name., which is said to be easier to translate.

Even Required if you want to change the %mail or %pass below has the same issue the original string has: Other languages could have more than a definite article, or could use no definite article at all.
In Italian, the definite articles are il, lo, la, gli, i, le, not considering that it is l'email, not la email, but it is la mail. Without knowing which word is used, after the article, I can just guess basing on the placeholder, with the consequence that l'mail or la email could appear, depending on my guess and what value is used for %mail.

In Norwegian seems to be even more difficult, as the translation of la signora seems to be damen, while the translation of il bambino seems to be barnet. In both the cases, the bold part in the word is the article. (The translation of signora would be dam.)

(Technically, the definite article in Norwegian is an enclitic, contrary to Italian and English where it is a proclitic.)

So, I came to two different conclusions based on my git research. That doesn't help this at all!

I have updated the issue summary

@avpaderno, do you have a suggestions to fix this?

The solution is simple: Do not use placeholders after an article.

(I forgot the link to the documentation page.)

The only time the %mail is used in a translatable string is in the core/modules/user/src/AccountForm.php file.
I would leave other cases of placeholder after an article to other issues.

Could the issue summary be updated to the standard template please.

I apologize: I was not able to retrieve this issue.

Much appreciated @avpaderno believe the change is good.

Committed/pushed to 11.x and cherry-picked to 10.4.x, thanks!