Use site default language for notification messages

Author: rimi-itk

docker-compose.yml

@@ -36,7 +36,7 @@ services:
       - PHP_MAX_EXECUTION_TIME=30
       - PHP_MEMORY_LIMIT=256M
       # Depending on the setup you may have to remove --read-envelope-from from msmtp (cf. https://marlam.de/msmtp/msmtp.html) or use SMTP to send mail
-      - PHP_SENDMAIL_PATH=/usr/bin/msmtp --host=mail --port=1025 --read-recipients --read-envelope-from
+      - PHP_SENDMAIL_PATH=/usr/bin/msmtp --host=mail --port=1025 --read-recipients
       - DOCKER_HOST_DOMAIN=${COMPOSE_DOMAIN}
       - COMPOSER_VERSION=2
       - PHP_IDE_CONFIG=serverName=localhost

web/profiles/custom/os2loop/modules/os2loop_mail_notifications/os2loop_mail_notifications.services.yml

@@ -14,3 +14,4 @@ services:
       - '@Drupal\os2loop_settings\Settings'
       - '@token'
       - '@plugin.manager.mail'
+      - '@language.default'

web/profiles/custom/os2loop/modules/os2loop_mail_notifications/src/Helper/MailHelper.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\os2loop_mail_notifications\Helper;
 
+use Drupal\Core\Language\LanguageDefault;
 use Drupal\Core\Mail\MailManagerInterface;
 use Drupal\Core\Render\Markup;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -26,27 +27,16 @@ class MailHelper {
    */
   private $config;
 
-  /**
-   * The token.
-   *
-   * @var \Drupal\Core\Utility\Token
-   */
-  private $token;
-
-  /**
-   * The mail manager.
-   *
-   * @var \Drupal\Core\Mail\MailManagerInterface
-   */
-  private $mailer;
-
   /**
    * Helper constructor.
    */
-  public function __construct(Settings $settings, Token $token, MailManagerInterface $mailer) {
+  public function __construct(
+    Settings $settings,
+    private readonly Token $token,
+    private readonly MailManagerInterface $mailer,
+    private readonly LanguageDefault $defaultLanguage
+  ) {
     $this->config = $settings->getConfig(SettingsForm::SETTINGS_NAME);
-    $this->token = $token;
-    $this->mailer = $mailer;
   }
 
   /**
@@ -80,7 +70,7 @@ public function mail($key, &$message, $params) {
    *   True if mail is sent.
    */
   public function sendNotification(User $user, array $groupedMessages) {
-    $langcode = $user->getPreferredLangcode();
+    $langcode = $this->defaultLanguage->get()->getId();
 
     $sections = [];
     foreach ($groupedMessages as $type => $messages) {
@@ -194,7 +184,12 @@ private function getMessageContent(Message $message, string $langCode): string {
 
     // Append any revision message.
     if ($message->hasField('os2loop_revision_message') && !empty($message->get('os2loop_revision_message')->getValue())) {
-      $content .= ' (' . $this->t('Revision message: @revision_message', ['@revision_message' => $message->get('os2loop_revision_message')->getString()]) . ')';
+      $revisionMessage = $this->t(
+        'Revision message: @revision_message',
+        ['@revision_message' => $message->get('os2loop_revision_message')->getString()],
+        ['langcode' => $langCode]
+      );
+      $content .= ' (' . $revisionMessage . ')';
     }
 
     return $content;