Add current_locale variable in LocaleSwitcherBlockService (#556)

* Add current_locale variable in LocaleSwitcherBlockService
sonata-project · Oct 11, 2021 · 94e0753 · 94e0753
1 parent c0ab559
commit 94e0753
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/src/Block/LocaleSwitcherBlockService.php b/src/Block/LocaleSwitcherBlockService.php
@@ -15,14 +15,27 @@
 
 use Sonata\BlockBundle\Block\BlockContextInterface;
 use Sonata\BlockBundle\Block\Service\AbstractBlockService;
+use Sonata\TranslationBundle\Provider\LocaleProviderInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Twig\Environment;
 
 /**
  * @author Nicolas Bastien <nbastien.pro@gmail.com>
  */
 final class LocaleSwitcherBlockService extends AbstractBlockService
 {
+    /**
+     * @var LocaleProviderInterface
+     */
+    private $localeProvider;
+
+    public function __construct(Environment $twig, LocaleProviderInterface $localeProvider)
+    {
+        parent::__construct($twig);
+        $this->localeProvider = $localeProvider;
+    }
+
     public function configureSettings(OptionsResolver $resolver): void
     {
         $resolver->setDefaults(
@@ -32,6 +45,7 @@ public function configureSettings(OptionsResolver $resolver): void
                 'template' => '@SonataTranslation/Block/block_locale_switcher.html.twig',
                 'locale_switcher_route' => null,
                 'locale_switcher_route_parameters' => [],
+                'current_locale' => $this->localeProvider->get(),
             ]
         );
     }

diff --git a/src/Resources/config/block.php b/src/Resources/config/block.php
@@ -21,5 +21,8 @@
 
         ->set('sonata_translation.block.locale_switcher', LocaleSwitcherBlockService::class)
             ->tag('sonata.block')
-            ->args([new ReferenceConfigurator('twig')]);
+            ->args([
+                new ReferenceConfigurator('twig'),
+                new ReferenceConfigurator('sonata_translation.admin.provider.request_locale_provider'),
+            ]);
 };
diff --git a/src/Resources/views/Block/block_locale_switcher.html.twig b/src/Resources/views/Block/block_locale_switcher.html.twig
@@ -2,17 +2,10 @@
 
 {% if admin.class is translatable %}
     {% set object = block_context.settings.object %}
-    {% set currentLocale = object.locale|default(null) %}
     {% set object_id = object ? admin.id(object) : null %}
     {% set locale_switcher_route = block_context.settings.locale_switcher_route|default(object_id is not null ? 'edit' : 'create') %}
     {% set locale_switcher_route_parameters = block_context.settings.locale_switcher_route_parameters %}
 
-    {% for extension in admin.extensions %}
-        {% if extension.translatableLocale is defined %}
-            {% set currentLocale = extension.translatableLocale(admin) %}
-        {% endif %}
-    {% endfor %}
-
     <div class="locale_switcher">
         {% apply spaceless %}
             {% for locale in sonata_translation_locales %}
@@ -21,7 +14,7 @@
                     {'id': object_id, 'tl': locale}|merge(locale_switcher_route_parameters)
                 ) }}"
                    accesskey=""
-                   {% if currentLocale == locale %}class="active"{% endif %}
+                   {% if block_context.settings.current_locale == locale %}class="active"{% endif %}
                    title="{{ 'admin.locale_switcher.tooltip' |trans([], 'SonataTranslationBundle') }}">
                     {{ locale|localeName(app.request.locale) }}
                 </a>

diff --git a/tests/Block/LocaleSwitcherBlockServiceTest.php b/tests/Block/LocaleSwitcherBlockServiceTest.php
@@ -15,15 +15,18 @@
 
 use Sonata\BlockBundle\Test\BlockServiceTestCase;
 use Sonata\TranslationBundle\Block\LocaleSwitcherBlockService;
+use Sonata\TranslationBundle\Provider\LocaleProviderInterface;
 use Twig\Environment;
 
 final class LocaleSwitcherBlockServiceTest extends BlockServiceTestCase
 {
     public function testDefaultSettings(): void
     {
         $environment = $this->createStub(Environment::class);
+        $localeProvider = $this->createStub(LocaleProviderInterface::class);
+        $localeProvider->method('get')->willReturn('en');
 
-        $localeSwitcherBlock = new LocaleSwitcherBlockService($environment);
+        $localeSwitcherBlock = new LocaleSwitcherBlockService($environment, $localeProvider);
 
         $blockContext = $this->getBlockContext($localeSwitcherBlock);
 
@@ -33,6 +36,7 @@ public function testDefaultSettings(): void
             'template' => '@SonataTranslation/Block/block_locale_switcher.html.twig',
             'locale_switcher_route' => null,
             'locale_switcher_route_parameters' => [],
+            'current_locale' => 'en',
         ], $blockContext);
     }
 }