Allow setting the translation domain globally and per-admin (#13)

kunicmarko20 · Feb 3, 2019 · 2247098 · 2247098
1 parent 2d66b5b
commit 2247098
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -45,6 +45,7 @@ sonata_auto_configure:
         manager_type: orm
         label_catalogue: ~
         label_translator_strategy: ~
+        translation_domain: ~
         group: ~
         pager_type: ~
     entity:
@@ -140,6 +141,7 @@ use App\Entity\Category;
  *     icon="<i class='fa fa-user'></i>",
  *     labelTranslatorStrategy="sonata.admin.label.strategy.native",
  *     labelCatalogue="App",
+ *     translationDomain="messages",
  *     pagerType="simple",
  *     controller=CategoryController::class,
  *     entity=Category::class,

diff --git a/src/Annotation/AdminOptions.php b/src/Annotation/AdminOptions.php
@@ -62,6 +62,11 @@ final class AdminOptions
      */
     public $labelCatalogue;
 
+    /**
+     * @var string
+     */
+    public $translationDomain;
+
     /**
      * @var string
      */

diff --git a/src/DependencyInjection/Compiler/AutoConfigureAdminClassesCompilerPass.php b/src/DependencyInjection/Compiler/AutoConfigureAdminClassesCompilerPass.php
@@ -57,6 +57,8 @@ public function process(ContainerBuilder $container): void
             ->getParameter('sonata.auto_configure.admin.label_catalogue');
         $annotationDefaults['label_translator_strategy'] = $container
             ->getParameter('sonata.auto_configure.admin.label_translator_strategy');
+        $annotationDefaults['translation_domain'] = $container
+            ->getParameter('sonata.auto_configure.admin.translation_domain');
         $annotationDefaults['group'] = $container->getParameter('sonata.auto_configure.admin.group');
         $annotationDefaults['pager_type'] = $container->getParameter('sonata.auto_configure.admin.pager_type');
 
@@ -84,7 +86,7 @@ public function process(ContainerBuilder $container): void
             $this->setDefaultValuesForAnnotation($annotation, $name, $annotationDefaults);
 
             $container->removeDefinition($id);
-            $container->setDefinition(
+            $definition = $container->setDefinition(
                 $annotation->adminCode ?? $id,
                 (new Definition($adminClass))
                     ->addTag('sonata.admin', $annotation->getOptions())
@@ -96,6 +98,10 @@ public function process(ContainerBuilder $container): void
                     ->setAutoconfigured(true)
                     ->setAutowired(true)
             );
+
+            if ($annotation->translationDomain) {
+                $definition->addMethodCall('setTranslationDomain', [$annotation->translationDomain]);
+            }
         }
     }
 
@@ -113,6 +119,10 @@ private function setDefaultValuesForAnnotation(AdminOptions $annotation, string
             $annotation->labelTranslatorStrategy = $defaults['label_translator_strategy'];
         }
 
+        if (!$annotation->translationDomain) {
+            $annotation->translationDomain = $defaults['translation_domain'];
+        }
+
         if (!$annotation->group) {
             $annotation->group = $defaults['group'];
         }

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -41,6 +41,9 @@ public function getConfigTreeBuilder(): TreeBuilder
                         ->scalarNode('label_translator_strategy')
                             ->defaultNull()
                         ->end()
+                        ->scalarNode('translation_domain')
+                            ->defaultNull()
+                        ->end()
                         ->scalarNode('group')
                             ->defaultNull()
                         ->end()

diff --git a/src/DependencyInjection/SonataAutoConfigureExtension.php b/src/DependencyInjection/SonataAutoConfigureExtension.php
@@ -26,6 +26,10 @@ protected function loadInternal(array $mergedConfig, ContainerBuilder $container
             'sonata.auto_configure.admin.label_translator_strategy',
             $mergedConfig['admin']['label_translator_strategy']
         );
+        $container->setParameter(
+            'sonata.auto_configure.admin.translation_domain',
+            $mergedConfig['admin']['translation_domain']
+        );
         $container->setParameter('sonata.auto_configure.admin.group', $mergedConfig['admin']['group']);
         $container->setParameter('sonata.auto_configure.admin.pager_type', $mergedConfig['admin']['pager_type']);
 

diff --git a/tests/DependencyInjection/SonataAutoConfigureExtensionTest.php b/tests/DependencyInjection/SonataAutoConfigureExtensionTest.php
@@ -25,6 +25,11 @@ public function testParametersInContainer(): void
             'sonata.auto_configure.admin.label_translator_strategy',
             null
         );
+
+        $this->assertContainerBuilderHasParameter(
+            'sonata.auto_configure.admin.translation_domain',
+            null
+        );
     }
 
     protected function getContainerExtensions(): array