add German translation and use token factory again

terminal42 · May 23, 2024 · a78d7cb · a78d7cb
1 parent 636e900
commit a78d7cb
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/contao/languages/de/nc_tokens.xlf b/contao/languages/de/nc_tokens.xlf
@@ -3,8 +3,12 @@
   <file datatype="php" source-language="en" target-language="de">
     <body>
       <trans-unit id="nc_tokens.admin_email">
-        <source>E-mail address of administrator of the current page (website root settings).</source>
-        <target>E-Mail-Adresse des Administrators der aktuellen Seite (Einstellungen der Rootseite).</target>
+        <source>E-mail address of the administrator of the current page (system config or website root settings).</source>
+        <target>E-Mail-Adresse des Administrators der aktuellen Seite (Systemeinstellungen oder Einstellungen der Rootseite).</target>
+      </trans-unit>
+      <trans-unit id="nc_tokens.admin_name">
+        <source>Friendly name for the e-mail address of the administrator of the current page (system config or website root settings).</source>
+        <target>Anzeigename für die E-Mail-Adresse des Administrators der aktuellen Seite (Systemeinstellungen oder Einstellungen der Rootseite).</target>
       </trans-unit>
       <trans-unit id="nc_tokens.form.form_*">
         <source>All the form fields.</source>

diff --git a/contao/languages/en/nc_tokens.xlf b/contao/languages/en/nc_tokens.xlf
@@ -2,14 +2,14 @@
 <xliff version="1.2">
   <file datatype="php" source-language="en" target-language="en">
     <body>
-      <trans-unit id="nc_tokens.admin_name">
-        <source>Friendly name for the e-mail address of the administrator of the current page (system config or website root settings).</source>
-        <target>Friendly name for the e-mail address of the administrator of the current page (system config or website root settings).</target>
-      </trans-unit>
       <trans-unit id="nc_tokens.admin_email">
         <source>E-mail address of the administrator of the current page (system config or website root settings).</source>
         <target>E-mail address of the administrator of the current page (system config or website root settings).</target>
       </trans-unit>
+      <trans-unit id="nc_tokens.admin_name">
+        <source>Friendly name for the e-mail address of the administrator of the current page (system config or website root settings).</source>
+        <target>Friendly name for the e-mail address of the administrator of the current page (system config or website root settings).</target>
+      </trans-unit>
       <trans-unit id="nc_tokens.form.form_*">
         <source>All the form fields.</source>
         <target>All the form fields.</target>

diff --git a/src/EventListener/AdminEmailTokenListener.php b/src/EventListener/AdminEmailTokenListener.php
@@ -15,7 +15,7 @@
 use Terminal42\NotificationCenterBundle\Parcel\Stamp\TokenCollectionStamp;
 use Terminal42\NotificationCenterBundle\Token\Definition\EmailTokenDefinition;
 use Terminal42\NotificationCenterBundle\Token\Definition\Factory\TokenDefinitionFactoryInterface;
-use Terminal42\NotificationCenterBundle\Token\Token;
+use Terminal42\NotificationCenterBundle\Token\Definition\TokenDefinitionInterface;
 
 class AdminEmailTokenListener
 {
@@ -30,8 +30,8 @@ public function __construct(
     public function onGetTokenDefinitions(GetTokenDefinitionsForNotificationTypeEvent $event): void
     {
         $event
-            ->addTokenDefinition($this->tokenDefinitionFactory->create(EmailTokenDefinition::class, 'admin_name', 'admin_name'))
-            ->addTokenDefinition($this->tokenDefinitionFactory->create(EmailTokenDefinition::class, 'admin_email', 'admin_email'))
+            ->addTokenDefinition($this->getTokenDefinition('admin_email'))
+            ->addTokenDefinition($this->getTokenDefinition('admin_name'))
         ;
     }
 
@@ -53,8 +53,8 @@ public function onCreateParcel(CreateParcelEvent $event): void
         }
 
         $event->getParcel()->getStamp(TokenCollectionStamp::class)->tokenCollection
-            ->addToken(new Token('admin_name', $email[0], $email[0]))
-            ->addToken(new Token('admin_email', $email[1], $email[1]))
+            ->addToken($this->getTokenDefinition('admin_email')->createToken('admin_email', $email[1]))
+            ->addToken($this->getTokenDefinition('admin_name')->createToken('admin_name', $email[0]))
         ;
     }
 
@@ -82,6 +82,11 @@ private function getEmailFromConfig(): array|null
         return $email ? $this->parseFriendlyEmail($email) : null;
     }
 
+    private function getTokenDefinition(string $token): TokenDefinitionInterface
+    {
+        return $this->tokenDefinitionFactory->create(EmailTokenDefinition::class, $token, $token);
+    }
+
     private function parseFriendlyEmail(string $email): array
     {
         return $this->contaoFramework->getAdapter(StringUtil::class)->splitFriendlyEmail($email);