Skip to content

Commit 520cf13

Browse files
committed
fix(flashes): rollback messages such as ci do not resolve translations
1 parent fd17989 commit 520cf13

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

src/Controller/MailTesterController.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Symfony\Component\HttpFoundation\Response;
1414
use Symfony\Component\HttpKernel\Attribute\AsController;
1515
use Symfony\Component\Routing\Attribute\Route;
16+
use Symfony\Contracts\Translation\TranslatorInterface;
1617
use Synolia\SyliusMailTesterPlugin\Form\Type\AbstractType;
1718
use Synolia\SyliusMailTesterPlugin\Form\Type\ChoiceSubjectsType;
1819
use Synolia\SyliusMailTesterPlugin\Form\Type\MailTesterType;
@@ -24,6 +25,7 @@ final class MailTesterController extends AbstractController
2425
{
2526
public function __construct(
2627
private readonly FormTypeResolver $formTypeResolver,
28+
private readonly TranslatorInterface $translator,
2729
#[Autowire(param: 'sylius.mailer.emails')]
2830
private readonly array $emails,
2931
) {
@@ -94,7 +96,7 @@ private function sendMail(Request $request, array $mailTester, SenderInterface $
9496
$sender->send($formData['subjects'], [$formData['recipient']], $this->getMailData($form, 'form_subject_chosen'), $this->getAttachments($form));
9597
}
9698

97-
$request->getSession()->getFlashBag()->add('success', 'synolia_mail_tester.admin.success');
99+
$request->getSession()->getFlashBag()->add('success', $this->translator->trans('sylius.ui.admin.mail_tester.success'));
98100
} catch (\Exception $exception) {
99101
$request->getSession()->getFlashBag()->add('error', $exception->getMessage());
100102
}

tests/Behat/Context/Ui/Admin/MailTesterContext.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use Sylius\Behat\Service\NotificationCheckerInterface;
1212
use Sylius\Behat\Service\Resolver\CurrentPageResolverInterface;
1313
use Symfony\Component\DependencyInjection\Attribute\Autowire;
14+
use Symfony\Contracts\Translation\TranslatorInterface;
1415
use Synolia\SyliusMailTesterPlugin\DataRetriever\EmailKeysDataRetriever;
1516
use Tests\Synolia\SyliusMailTesterPlugin\Behat\Page\Admin\MailTester\IndexPageInterface;
1617
use Webmozart\Assert\Assert;
@@ -24,6 +25,7 @@ public function __construct(
2425
private EmailKeysDataRetriever $emailKeysDataRetriever,
2526
#[Autowire('@sylius.behat.notification_checker.admin')]
2627
private NotificationCheckerInterface $notificationChecker,
28+
private TranslatorInterface $translator,
2729
) {
2830
}
2931

@@ -163,7 +165,7 @@ public function theSubjectsShouldHaveEverySubjects(): void
163165
public function theEmailHasBeenSuccessfullySend(): void
164166
{
165167
$this->notificationChecker->checkNotification(
166-
'Mail successfully sent',
168+
$this->translator->trans('sylius.ui.admin.mail_tester.success'),
167169
NotificationType::success(),
168170
);
169171
}

translations/flashes.en.yml

-3
This file was deleted.

translations/flashes.fr.yml

-3
This file was deleted.

translations/messages.en.yml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ sylius:
55
recipient: Recipient
66
submit: Send
77
change_form_subject: Choose subject
8+
success: Mail successfully sent
89
every_subjects: All subjects
910
menu:
1011
admin:

translations/messages.fr.yml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ sylius:
55
recipient: Destinataire
66
submit: Envoyer
77
change_form_subject: Choisir le sujet
8+
success: L'email a été envoyé avec succès
89
every_subjects: Tous les sujets
910
menu:
1011
admin:

0 commit comments

Comments
 (0)