fix: Reset password, email confirm, activation not locale aware

Author: imorland

framework/core/src/Mail/SetTranslatorLocaleForEmailTrait.php

@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
+namespace Flarum\Mail;
+
+use Flarum\Locale\Translator;
+use Flarum\Settings\SettingsRepositoryInterface;
+use Flarum\User\UserRepository;
+
+trait SetTranslatorLocaleForEmailTrait
+{
+    /**
+     * Set the translator locale based on the user's preference for the given email.
+     * Falls back to forum default if user not found or has no preference.
+     */
+    protected function setTranslatorLocaleForEmail(
+        Translator $translator,
+        SettingsRepositoryInterface $settings,
+        string $email
+    ): void {
+        $users = resolve(UserRepository::class);
+        $user = $users->findByEmail($email);
+        
+        $locale = $user 
+            ? ($user->getPreference('locale') ?? $settings->get('default_locale'))
+            : $settings->get('default_locale');
+            
+        $translator->setLocale($locale);
+    }
+}

framework/core/src/User/AccountActivationMailer.php

@@ -10,6 +10,7 @@
 namespace Flarum\User;
 
 use Flarum\Http\UrlGenerator;
+use Flarum\Mail\SetTranslatorLocaleForEmailTrait;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Flarum\User\Event\Registered;
 use Illuminate\Contracts\Queue\Queue;
@@ -18,6 +19,7 @@
 class AccountActivationMailer
 {
     use AccountActivationMailerTrait;
+    use SetTranslatorLocaleForEmailTrait;
 
     /**
      * @var SettingsRepositoryInterface
@@ -61,6 +63,8 @@ public function handle(Registered $event)
             return;
         }
 
+        $this->setTranslatorLocaleForEmail($this->translator, $this->settings, $user->email);
+
         $token = $this->generateToken($user, $user->email);
         $data = $this->getEmailData($user, $token);
 

framework/core/src/User/EmailConfirmationMailer.php

@@ -11,13 +11,16 @@
 
 use Flarum\Http\UrlGenerator;
 use Flarum\Mail\Job\SendRawEmailJob;
+use Flarum\Mail\SetTranslatorLocaleForEmailTrait;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Flarum\User\Event\EmailChangeRequested;
 use Illuminate\Contracts\Queue\Queue;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class EmailConfirmationMailer
 {
+    use SetTranslatorLocaleForEmailTrait;
+
     /**
      * @var SettingsRepositoryInterface
      */
@@ -49,6 +52,9 @@ public function __construct(SettingsRepositoryInterface $settings, Queue $queue,
     public function handle(EmailChangeRequested $event)
     {
         $email = $event->email;
+
+        $this->setTranslatorLocaleForEmail($this->translator, $this->settings, $email);
+
         $data = $this->getEmailData($event->user, $email);
 
         $body = $this->translator->trans('core.email.confirm_email.body', $data);

framework/core/src/User/Job/RequestPasswordResetJob.php

@@ -11,6 +11,7 @@
 
 use Flarum\Http\UrlGenerator;
 use Flarum\Mail\Job\SendRawEmailJob;
+use Flarum\Mail\SetTranslatorLocaleForEmailTrait;
 use Flarum\Queue\AbstractJob;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Flarum\User\PasswordToken;
@@ -20,6 +21,8 @@
 
 class RequestPasswordResetJob extends AbstractJob
 {
+    use SetTranslatorLocaleForEmailTrait;
+
     /**
      * @var string
      */
@@ -36,9 +39,11 @@ public function handle(
         SettingsRepositoryInterface $settings,
         UrlGenerator $url,
         TranslatorInterface $translator,
-        UserRepository $users,
         Queue $queue
     ) {
+        $this->setTranslatorLocaleForEmail($translator, $settings, $this->email);
+
+        $users = resolve(UserRepository::class);
         $user = $users->findByEmail($this->email);
 
         if (! $user) {