[framework] admin now can select the administration locale (#3577)

shopsys · Nov 7, 2024 · 10283db · 10283db
2 parents eb61eb0 + fd97b3f
commit 10283db
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/app/config/packages/security.yaml b/app/config/packages/security.yaml
@@ -364,6 +364,7 @@ security:
         - { path: ^/%admin_url%/administrator/my-account/, roles: ROLE_ADMIN }
         - { path: ^/%admin_url%/administrator/enable-two-factor-authentication/, roles: ROLE_ADMIN }
         - { path: ^/%admin_url%/administrator/disable-two-factor-authentication/, roles: ROLE_ADMIN }
+        - { path: ^/%admin_url%/administrator/select-locale/, roles: ROLE_ADMIN }
         - { path: ^/%admin_url%/administrator/groups/list/, roles: ROLE_ADMINISTRATOR_VIEW }
         - { path: ^/%admin_url%/administrator/groups/edit/, roles: ROLE_ADMINISTRATOR_FULL }
         - { path: ^/%admin_url%/administrator/groups/new/, roles: ROLE_ADMINISTRATOR_FULL }

diff --git a/app/config/parameters_common.yaml b/app/config/parameters_common.yaml
@@ -9,7 +9,7 @@ parameters:
     debug.error_handler.throw_at: -1
     locale: en
     shopsys.admin_display_timezone: Europe/Prague
-    shopsys.admin_locale: en
+    shopsys.allowed_admin_locales: ['en', 'cs']
     shopsys.cron_timezone: Europe/Prague
 
     # Set to true to log validation errors with log level ERROR instead of INFO

diff --git a/app/tests/App/Functional/Twig/PriceExtensionTest.php b/app/tests/App/Functional/Twig/PriceExtensionTest.php
@@ -10,6 +10,7 @@
 use Shopsys\FrameworkBundle\Component\Domain\AdminDomainTabsFacade;
 use Shopsys\FrameworkBundle\Component\Domain\Domain;
 use Shopsys\FrameworkBundle\Component\Money\Money;
+use Shopsys\FrameworkBundle\Model\Administrator\Security\AdministratorFrontSecurityFacade;
 use Shopsys\FrameworkBundle\Model\Localization\IntlCurrencyRepository;
 use Shopsys\FrameworkBundle\Model\Localization\Localization;
 use Shopsys\FrameworkBundle\Model\Pricing\Currency\Currency;
@@ -202,7 +203,11 @@ private function getPriceExtensionWithMockedConfiguration(): PriceExtension
         $currencyFacadeMock
             ->method('getDefaultCurrency')
             ->willReturn($domain1DefaultCurrency);
-        $localization = new Localization($this->domain, 'en');
+        $administratorFrontSecurityFacadeMock = $this->getMockBuilder(AdministratorFrontSecurityFacade::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $localization = new Localization($this->domain, ['en'], $administratorFrontSecurityFacadeMock);
 
         return new PriceExtension(
             $currencyFacadeMock,

diff --git a/app/tests/App/Smoke/Http/RouteConfigCustomization.php b/app/tests/App/Smoke/Http/RouteConfigCustomization.php
@@ -402,6 +402,13 @@ private function configureAdminRoutes(RouteConfigCustomizer $routeConfigCustomiz
                 $config->changeDefaultRequestDataSet('Use catnums instead of ID')
                     ->setParameter('catnums', '9177759,7700768,9146508')
                     ->setExpectedStatusCode(200);
+            })
+            ->customizeByRouteName('admin_localization_selectlocale', function (RouteConfig $config) {
+                /** @var \Shopsys\FrameworkBundle\Component\Domain\Domain $domain */
+                $domain = $this->container->get(Domain::class);
+                $config->changeDefaultRequestDataSet()
+                    ->setParameter('locale', $domain->getDomainConfigById(Domain::FIRST_DOMAIN_ID)->getLocale())
+                    ->setExpectedStatusCode(302);
             });
     }