Merge pull request #44 from cleverage/40

#40 Fix localisation issues

Author: tonongregory

config/services/controller.yaml

@@ -12,5 +12,7 @@ services:
             $context: '@EasyCorp\Bundle\EasyAdminBundle\Factory\AdminContextFactory'
             $logDirectory: '%kernel.logs_dir%'
             $processExecutionRepository: '@cleverage_ui_process.repository.process_execution'
+            $intlFormatter: '@EasyCorp\Bundle\EasyAdminBundle\Intl\IntlFormatter'
+            $translator: '@translator'
         tags:
             - { name: 'controller.service_arguments' }

config/services/twig.yaml

@@ -26,6 +26,8 @@ services:
     cleverage_ui_process.twig.log_level_extension_runtime:
         class: CleverAge\UiProcessBundle\Twig\Runtime\LogLevelExtensionRuntime
         public: false
+        calls:
+            - [setTranslator, ['@translator']]
         tags:
             - { name: 'twig.runtime' }
 
@@ -56,4 +58,4 @@ services:
         class: CleverAge\UiProcessBundle\Twig\Components\BootstrapModal
         shared: false
         tags:
-            - { name: 'twig.component', key: 'ui:BootstrapModal', template: '@CleverAgeUiProcess/components/BootstrapModal.html.twig' }
+            - { name: 'twig.component', key: 'ui:BootstrapModal', template: '@CleverAgeUiProcess/components/BootstrapModal.html.twig' }

src/Controller/Admin/LogRecordCrudController.php

@@ -51,7 +51,7 @@ public function configureFields(string $pageName): iterable
         return [
             LogLevelField::new('level'),
             TextField::new('message')->setMaxLength(512),
-            DateTimeField::new('createdAt')->setFormat('Y/M/dd H:mm:ss'),
+            DateTimeField::new('createdAt')->setFormat('short', 'medium'),
             ContextField::new('context')
                 ->onlyOnDetail(),
             BooleanField::new('contextIsEmpty', 'Has context info ?')
@@ -87,9 +87,14 @@ public function configureFilters(Filters $filters): Filters
         $processList = array_map(fn (ProcessConfiguration $cfg) => $cfg->getCode(), $processList);
 
         return $filters->add(
-            LogProcessFilter::new('process', $processList, $id)
+            LogProcessFilter::new('Process', $processList, $id)
         )->add(
-            ChoiceFilter::new('level')->setChoices(array_combine(Level::NAMES, Level::VALUES))
+            ChoiceFilter::new('level')
+                ->setTranslatableChoices(array_combine(
+                    Level::VALUES,
+                    array_map(fn ($value) => 'enum.log_level.'.strtolower((string) $value), Level::NAMES)
+                ))
+                ->setFormTypeOption('translation_domain', 'enums'),
         )->add('message')->add('context')->add('createdAt');
     }
 }

src/Controller/Admin/Process/ListAction.php

@@ -14,6 +14,7 @@
 namespace CleverAge\UiProcessBundle\Controller\Admin\Process;
 
 use CleverAge\UiProcessBundle\Manager\ProcessConfigurationsManager;
+use EasyCorp\Bundle\EasyAdminBundle\Contracts\Intl\IntlFormatterInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
@@ -23,12 +24,17 @@
 #[IsGranted('ROLE_USER')]
 class ListAction extends AbstractController
 {
+    public function __construct(private readonly IntlFormatterInterface $intlFormatter)
+    {
+    }
+
     public function __invoke(ProcessConfigurationsManager $processConfigurationsManager): Response
     {
         return $this->render(
             '@CleverAgeUiProcess/admin/process/list.html.twig',
             [
                 'processes' => $processConfigurationsManager->getPublicProcesses(),
+                'IntlFormatterService' => $this->intlFormatter,
             ]
         );
     }

src/Controller/Admin/ProcessExecutionCrudController.php

@@ -32,13 +32,15 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 #[IsGranted('ROLE_USER')]
 class ProcessExecutionCrudController extends AbstractCrudController
 {
     public function __construct(
         private readonly ProcessExecutionRepository $processExecutionRepository,
         private readonly string $logDirectory,
+        private readonly TranslatorInterface $translator,
     ) {
     }
 
@@ -52,12 +54,12 @@ public function configureFields(string $pageName): iterable
         return [
             TextField::new('code'),
             EnumField::new('status'),
-            DateTimeField::new('startDate')->setFormat('Y/M/dd H:mm:ss'),
-            DateTimeField::new('endDate')->setFormat('Y/M/dd H:mm:ss'),
+            DateTimeField::new('startDate')->setFormat('short', 'medium'),
+            DateTimeField::new('endDate')->setFormat('short', 'medium'),
             TextField::new('source')->setTemplatePath('@CleverAgeUiProcess/admin/field/process_source.html.twig'),
             TextField::new('target')->setTemplatePath('@CleverAgeUiProcess/admin/field/process_target.html.twig'),
             TextField::new('duration')->formatValue(function ($value, ProcessExecution $entity) {
-                return $entity->duration(); // returned format can be changed here
+                return $entity->duration($this->translator->trans('%H hour(s) %I min(s) %S s')); // returned format can be changed here
             }),
             ArrayField::new('report')->setTemplatePath('@CleverAgeUiProcess/admin/field/report.html.twig'),
             ContextField::new('context'),

src/Entity/Enum/ProcessExecutionStatus.php

@@ -13,9 +13,17 @@
 
 namespace CleverAge\UiProcessBundle\Entity\Enum;
 
-enum ProcessExecutionStatus: string
+use Symfony\Contracts\Translation\TranslatableInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+enum ProcessExecutionStatus: string implements TranslatableInterface
 {
     case Started = 'started';
     case Finish = 'finish';
     case Failed = 'failed';
+
+    public function trans(TranslatorInterface $translator, ?string $locale = null): string
+    {
+        return $translator->trans('enum.process_execution_status.'.$this->value, domain: 'enums', locale: $locale);
+    }
 }

src/Entity/Enum/ProcessScheduleType.php

@@ -13,8 +13,16 @@
 
 namespace CleverAge\UiProcessBundle\Entity\Enum;
 
-enum ProcessScheduleType: string
+use Symfony\Contracts\Translation\TranslatableInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+enum ProcessScheduleType: string implements TranslatableInterface
 {
     case CRON = 'cron';
     case EVERY = 'every';
+
+    public function trans(TranslatorInterface $translator, ?string $locale = null): string
+    {
+        return $translator->trans('enum.process_schedule_type.'.$this->value, domain: 'enums', locale: $locale);
+    }
 }

src/Twig/Extension/LogLevelExtension.php

@@ -23,6 +23,7 @@ public function getFunctions(): array
     {
         return [
             new TwigFunction('log_label', [LogLevelExtensionRuntime::class, 'getLabel']),
+            new TwigFunction('log_translation', [LogLevelExtensionRuntime::class, 'getTranslation']),
             new TwigFunction('log_css_class', [LogLevelExtensionRuntime::class, 'getCssClass']),
         ];
     }

src/Twig/Runtime/LogLevelExtensionRuntime.php

@@ -14,15 +14,28 @@
 namespace CleverAge\UiProcessBundle\Twig\Runtime;
 
 use Monolog\Level;
+use Symfony\Contracts\Translation\TranslatorInterface;
 use Twig\Extension\RuntimeExtensionInterface;
 
 class LogLevelExtensionRuntime implements RuntimeExtensionInterface
 {
+    private TranslatorInterface $translator;
+
+    public function setTranslator(TranslatorInterface $translator): void
+    {
+        $this->translator = $translator;
+    }
+
     public function getLabel(int $value): string
     {
         return Level::from($value)->getName();
     }
 
+    public function getTranslation(string $key): string
+    {
+        return $this->translator->trans('enum.log_level.'.strtolower($key), domain: 'enums');
+    }
+
     public function getCssClass(string|int $value): string
     {
         return \is_int($value) ?

templates/admin/field/enum.html.twig

@@ -1,2 +1,2 @@
 {% set class = field.value.value == 'failed' ? 'danger' : 'success' %}
-<span class="badge badge-{{ class }}">{{ field.value.value }}</span>
+<span class="badge badge-{{ class }}">{{ field.value|trans() }}</span>