mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-27 05:31:29 +01:00
Code Issues Releases Wiki Activity

Switch to ICU MessageFormat (#2759)

Browse Source
This commit is contained in:
Alexander Skvortsov
2021-04-30 12:44:39 -04:00
committed by GitHub
parent edaf45d133
commit b45519974a
24 changed files with 19152 additions and 3351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/User/AccountActivationMailerTrait.php
View File

@@ -36,9 +36,9 @@ trait AccountActivationMailerTrait
protected function getEmailData(User $user, EmailToken $token)
{
return [
'{username}' => $user->display_name,
'{url}' => $this->url->to('forum')->route('confirmEmail', ['token' => $token->token]),
'{forum}' => $this->settings->get('forum_title')
'username' => $user->display_name,
'url' => $this->url->to('forum')->route('confirmEmail', ['token' => $token->token]),
'forum' => $this->settings->get('forum_title')
];
}

8
src/User/Command/RequestPasswordResetHandler.php
View File

@@ -104,13 +104,13 @@ class RequestPasswordResetHandler
$token->save();
$data = [
'{username}' => $user->display_name,
'{url}' => $this->url->to('forum')->route('resetPassword', ['token' => $token->token]),
'{forum}' => $this->settings->get('forum_title'),
'username' => $user->display_name,
'url' => $this->url->to('forum')->route('resetPassword', ['token' => $token->token]),
'forum' => $this->settings->get('forum_title'),
];
$body = $this->translator->trans('core.email.reset_password.body', $data);
$subject = '['.$data['{forum}'].'] '.$this->translator->trans('core.email.reset_password.subject');
$subject = '['.$data['forum'].'] '.$this->translator->trans('core.email.reset_password.subject');
$this->queue->push(new SendRawEmailJob($user->email, $subject, $body));

8
src/User/EmailConfirmationMailer.php
View File

@@ -52,7 +52,7 @@ class EmailConfirmationMailer
$data = $this->getEmailData($event->user, $email);
$body = $this->translator->trans('core.email.confirm_email.body', $data);
$subject = '['.$data['{forum}'].'] '.$this->translator->trans('core.email.confirm_email.subject');
$subject = '['.$data['forum'].'] '.$this->translator->trans('core.email.confirm_email.subject');
$this->queue->push(new SendRawEmailJob($email, $subject, $body));
}
@@ -82,9 +82,9 @@ class EmailConfirmationMailer
$token = $this->generateToken($user, $email);
return [
'{username}' => $user->display_name,
'{url}' => $this->url->to('forum')->route('confirmEmail', ['token' => $token->token]),
'{forum}' => $this->settings->get('forum_title')
'username' => $user->display_name,
'url' => $this->url->to('forum')->route('confirmEmail', ['token' => $token->token]),
'forum' => $this->settings->get('forum_title')
];
}
}