Skip to content

fix: preserve user locale for erasure completion email #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
grimur82 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: preserve user locale for erasure completion email #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9eef7c9
fix: preserve user locale for erasure completion email
grimur82 Jun 30, 2026
3e312d4
fix: stan issues
grimur82 Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Http/Controller/ExportController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
200,
[
'Content-Type' => 'application/zip',
'Content-Length' => $this->storageManager->getStoredExportSize($export),
'Content-Length' => (string) $this->storageManager->getStoredExportSize($export),
'Content-Disposition' => 'attachment; filename="data-export-'.$export->user->username.'-'.$export->created_at->toIso8601String().'.zip"',
]
);
Expand Down
7 changes: 7 additions & 0 deletions src/Jobs/ErasureJob.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use Flarum\Gdpr\Models\ErasureRequest;
use Flarum\Gdpr\Notifications\ErasureCompletedBlueprint;
use Flarum\Http\UrlGenerator;
use Flarum\Locale\Translator;
use Flarum\Settings\SettingsRepositoryInterface;
use Flarum\User\User;
use Illuminate\Contracts\Events\Dispatcher;
Expand Down Expand Up @@ -84,6 +85,12 @@ public function handle(
$this->erasureRequest
));

// Capture the user's locale on the shared translator before
// anonymization wipes their preferences. The completion email below
// re-uses the same translator instance, so this carries through.
/** @var TranslatorInterface&Translator $translator */
$translator->setLocale($user->getPreference('locale') ?? $this->settings->get('default_locale'));

$this->{$mode}($user, $processor);

$this->sendUserConfirmation($mode, $username, $email, $mailer, $translator);
Expand Down
Loading