fix: improve injecting the language into mailer, fixes #43

FriendsOfShopware · Feb 10, 2024 · 0a1379f · 0a1379f
1 parent 282f1b6
commit 0a1379f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 27 deletions.
diff --git a/src/Services/MailFinderService.php b/src/Services/MailFinderService.php
@@ -31,9 +31,6 @@ public function __construct(
         private readonly FilesystemLoader $filesystemLoader,
         #[TaggedIterator('frosh_template_mail.loader')]
         private readonly iterable $availableLoaders,
-        private readonly EntityRepository $languageRepository,
-        #[Autowire(service: Translator::class)]
-        private readonly AbstractTranslator $translator,
         private readonly SearchPathProvider $searchPathProvider,
         private readonly Connection $connection
     ) {
@@ -82,8 +79,6 @@ public function findTemplateByTechnicalName(
                     foreach ($searchFolder as $folder) {
                         $filePath = $path . '/email/' . $folder . '/' . $technicalName . '/' . $type . $supportedExtension;
                         if (file_exists($filePath) && $content = $availableLoader->load($filePath)) {
-                            $this->fixTranslator($businessEvent);
-
                             return $returnFolder ? $filePath : $content;
                         }
                     }
@@ -93,25 +88,4 @@ public function findTemplateByTechnicalName(
 
         return null;
     }
-
-    private function fixTranslator(TemplateMailContext $businessEvent): void
-    {
-        $criteria = new Criteria([$businessEvent->getContext()->getLanguageId()]);
-        $criteria->addAssociation('locale');
-
-        /** @var LanguageEntity $language */
-        $language = $this->languageRepository->search($criteria, $businessEvent->getContext())->first();
-
-        $localCode = $language->getLocale()?->getCode();
-        if ($localCode === null) {
-            return;
-        }
-
-        $this->translator->injectSettings(
-            $businessEvent->getSalesChannelId(),
-            $businessEvent->getContext()->getLanguageId(),
-            $localCode,
-            $businessEvent->getContext()
-        );
-    }
 }
diff --git a/src/Subscriber/FlowSubscriber.php b/src/Subscriber/FlowSubscriber.php
@@ -8,18 +8,25 @@
 use Shopware\Core\Content\Flow\Events\FlowSendMailActionEvent;
 use Shopware\Core\Content\MailTemplate\Aggregate\MailTemplateType\MailTemplateTypeEntity;
 use Shopware\Core\Defaults;
+use Shopware\Core\Framework\Adapter\Translation\AbstractTranslator;
+use Shopware\Core\Framework\Adapter\Translation\Translator;
 use Shopware\Core\Framework\Context;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
 use Shopware\Core\Framework\Validation\DataBag\DataBag;
+use Shopware\Core\System\Language\LanguageEntity;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
 class FlowSubscriber implements EventSubscriberInterface
 {
     public function __construct(
         private readonly EntityRepository $mailTemplateTypeRepository,
-        private readonly MailFinderServiceInterface $mailFinderService
+        private readonly MailFinderServiceInterface $mailFinderService,
+        #[Autowire(service: Translator::class)]
+        private readonly AbstractTranslator $translator,
+        private readonly EntityRepository $languageRepository,
     ) {
     }
 
@@ -48,6 +55,8 @@ public function sendMail(DataBag $dataBag, string $mailTemplateTypeId, Context $
         $technicalName = $mailTemplateType->getTechnicalName();
         $event = $this->createTemplateMailContext($dataBag, $context);
 
+        $this->fixTranslator($event);
+
         $html = $this->mailFinderService->findTemplateByTechnicalName(MailFinderService::TYPE_HTML, $technicalName, $event);
         $plain = $this->mailFinderService->findTemplateByTechnicalName(MailFinderService::TYPE_PLAIN, $technicalName, $event);
         $subject = $this->mailFinderService->findTemplateByTechnicalName(MailFinderService::TYPE_SUBJECT, $technicalName, $event);
@@ -74,4 +83,25 @@ private function createTemplateMailContext(ParameterBag $dataBag, Context $conte
             $context
         );
     }
+
+    private function fixTranslator(TemplateMailContext $businessEvent): void
+    {
+        $criteria = new Criteria([$businessEvent->getContext()->getLanguageId()]);
+        $criteria->addAssociation('locale');
+
+        /** @var LanguageEntity $language */
+        $language = $this->languageRepository->search($criteria, $businessEvent->getContext())->first();
+
+        $localCode = $language->getLocale()?->getCode();
+        if ($localCode === null) {
+            return;
+        }
+
+        $this->translator->injectSettings(
+            $businessEvent->getSalesChannelId(),
+            $businessEvent->getContext()->getLanguageId(),
+            $localCode,
+            $businessEvent->getContext()
+        );
+    }
 }