Issues/2980952: Update message on cancelling account with e-mail confirmation request.

Closes #2980952

core/modules/user/src/Form/UserCancelForm.php

@@ -149,9 +149,14 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
       $this->entity->user_cancel_notify = $form_state->getValue('user_cancel_notify');
       $this->entity->save();
       _user_mail_notify('cancel_confirm', $this->entity);
-      $this->messenger()->addStatus($this->t('A confirmation request to cancel your account has been sent to your email address.'));
       $this->logger('user')->info('Sent account cancellation request to %name %email.', ['%name' => $this->entity->label(), '%email' => '<' . $this->entity->getEmail() . '>']);
 
+      $cancel_message = $this->t('A confirmation request to cancel your account has been sent to your email address.');
+      if ($this->entity->id() !== $this->currentUser()->id()) {
+        $cancel_message = $this->t("A confirmation request to cancel the account %name has been sent to the user's email address.", ['%name' => $this->entity->label()]);
+      }
+      $this->messenger()->addStatus($cancel_message);
+
       $form_state->setRedirect(
         'entity.user.canonical',
         ['user' => $this->entity->id()]

[Théodore Biadala]

any chance we can simplify? The action taken is the same in both branches of the condition, no need to duplicate it, just need to change the message in some cases.

-      $messenger = $this->messenger();
-      if ($this->entity->id() == $this->currentUser()->id()) {
-        $messenger->addStatus($this->t('A confirmation request to cancel your account has been sent to your email address.'));
-      }
-      else {
-        $messenger->addStatus($this->t("A confirmation request to cancel the account %name has been sent to the user's email address.", ['%name' => $this->entity->label()]));
-      }
+      $cancel_message = $this->t('A confirmation request to cancel your account has been sent to your email address.');
+      if ($this->entity->id() !== $this->currentUser()->id()) {{
+        $cancel_message = $this->t("A confirmation request to cancel the account %name has been sent to the user's email address.", ['%name' => $this->entity->label()]);
+      }
+      $this->messenger()->addStatus($cancel_message);