Remove locale middleware (#341)

yiisoft · Feb 5, 2025 · dac04b1 · dac04b1
1 parent 7e3746a
commit dac04b1
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 56 deletions.
diff --git a/config/common/routes.php b/config/common/routes.php
@@ -7,7 +7,7 @@
 use Yiisoft\Router\Route;
 
 return [
-    Group::create('/{_language}')
+    Group::create()
         ->routes(
             Route::get('/')->action([SiteController::class, 'index'])->name('home'),
         ),

diff --git a/config/web/di/application.php b/config/web/di/application.php
@@ -21,10 +21,4 @@
             'fallbackHandler' => Reference::to(NotFoundHandler::class),
         ],
     ],
-    \Yiisoft\Yii\Middleware\Locale::class => [
-        '__construct()' => [
-            'supportedLocales' => $params['locale']['locales'],
-            'ignoredRequestUrlPatterns' => $params['locale']['ignoredRequests'],
-        ],
-    ],
 ];
diff --git a/config/web/events.php b/config/web/events.php
@@ -2,9 +2,5 @@
 
 declare(strict_types=1);
 
-use App\EventHandler\SetLocaleEventHandler;
-use Yiisoft\Yii\Middleware\Event\SetLocaleEvent;
-
 return [
-    SetLocaleEvent::class => [[SetLocaleEventHandler::class, 'handle']],
 ];
diff --git a/config/web/params.php b/config/web/params.php
@@ -5,22 +5,11 @@
 use Yiisoft\ErrorHandler\Middleware\ErrorCatcher;
 use Yiisoft\Router\Middleware\Router;
 use Yiisoft\Session\SessionMiddleware;
-use Yiisoft\Yii\Middleware\Locale;
 
 return [
     'middlewares' => [
         ErrorCatcher::class,
         SessionMiddleware::class,
-        Locale::class,
         Router::class,
     ],
-
-    'locale' => [
-        'locales' => ['en' => 'en-US', 'ru' => 'ru-RU', 'de' => 'de-DE'],
-        'ignoredRequests' => [
-            '/gii**',
-            '/debug**',
-            '/inspect**',
-        ],
-    ],
 ];
diff --git a/src/EventHandler/SetLocaleEventHandler.php b/src/EventHandler/SetLocaleEventHandler.php
diff --git a/tests/Acceptance/HomeCest.php b/tests/Acceptance/HomeCest.php
@@ -15,12 +15,4 @@ public function testIndexPage(AcceptanceTester $I): void
         $I->expectTo('see page home.');
         $I->see('Hello!');
     }
-
-    public function testIndexPageRu(AcceptanceTester $I): void
-    {
-        $I->wantTo('home page works.');
-        $I->amOnPage('/ru/');
-        $I->expectTo('see page home.');
-        $I->see('Привет!');
-    }
 }
diff --git a/tests/Acceptance/NotFoundHandlerCest.php b/tests/Acceptance/NotFoundHandlerCest.php
@@ -13,7 +13,7 @@ public function about(AcceptanceTester $I): void
         $I->amOnPage('/about');
         $I->wantTo('see about page.');
         $I->see('404');
-        $I->see('The page /en/about not found.');
+        $I->see('The page /about not found.');
         $I->see('The above error occurred while the Web server was processing your request.');
         $I->see('Please contact us if you think this is a server error. Thank you.');
     }
@@ -23,7 +23,7 @@ public function aboutReturnHome(AcceptanceTester $I): void
         $I->amOnPage('/about');
         $I->wantTo('see about page.');
         $I->see('404');
-        $I->see('The page /en/about not found.');
+        $I->see('The page /about not found.');
         $I->see('The above error occurred while the Web server was processing your request.');
         $I->see('Please contact us if you think this is a server error. Thank you.');
         $I->click('Go Back Home');