From a2d42a43f91ebfb2d4ce4c01b72dc6d780359275 Mon Sep 17 00:00:00 2001
From: Adam Schubert <adam.schubert@sg1-game.net>
Date: Thu, 4 Jan 2018 13:12:24 +0100
Subject: [PATCH] Migrate to new dravencms/locale

---
 .../AdminModule/Components/Seo/RobotsGrid/RobotsGrid.php  | 8 ++++----
 .../Components/Seo/TrackingGrid/TrackingGrid.php          | 8 ++++----
 .../Seo/TrackingServiceGrid/TrackingServiceGrid.php       | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Dravencms/AdminModule/Components/Seo/RobotsGrid/RobotsGrid.php b/src/Dravencms/AdminModule/Components/Seo/RobotsGrid/RobotsGrid.php
index 6a55536..4a4ce81 100644
--- a/src/Dravencms/AdminModule/Components/Seo/RobotsGrid/RobotsGrid.php
+++ b/src/Dravencms/AdminModule/Components/Seo/RobotsGrid/RobotsGrid.php
@@ -23,7 +23,7 @@
 
 use Dravencms\Components\BaseControl\BaseControl;
 use Dravencms\Components\BaseGrid\BaseGridFactory;
-use Dravencms\Locale\CurrentLocale;
+use Dravencms\Locale\CurrentLocaleResolver;
 use Dravencms\Model\Locale\Repository\LocaleRepository;
 use Dravencms\Model\Seo\Repository\RobotsRepository;
 use Kdyby\Doctrine\EntityManager;
@@ -58,20 +58,20 @@ class RobotsGrid extends BaseControl
      * @param RobotsRepository $robotsRepository
      * @param BaseGridFactory $baseGridFactory
      * @param EntityManager $entityManager
-     * @param CurrentLocale $currentLocale
+     * @param CurrentLocaleResolver $currentLocaleResolver
      */
     public function __construct(
         RobotsRepository $robotsRepository,
         BaseGridFactory $baseGridFactory,
         EntityManager $entityManager,
-        CurrentLocale $currentLocale
+        CurrentLocaleResolver $currentLocaleResolver
     )
     {
         parent::__construct();
 
         $this->baseGridFactory = $baseGridFactory;
         $this->robotsRepository = $robotsRepository;
-        $this->currentLocale = $currentLocale;
+        $this->currentLocale = $currentLocaleResolver->getCurrentLocale();
         $this->entityManager = $entityManager;
     }
 
diff --git a/src/Dravencms/AdminModule/Components/Seo/TrackingGrid/TrackingGrid.php b/src/Dravencms/AdminModule/Components/Seo/TrackingGrid/TrackingGrid.php
index a24f6bc..92c3c4e 100644
--- a/src/Dravencms/AdminModule/Components/Seo/TrackingGrid/TrackingGrid.php
+++ b/src/Dravencms/AdminModule/Components/Seo/TrackingGrid/TrackingGrid.php
@@ -23,7 +23,7 @@
 
 use Dravencms\Components\BaseControl\BaseControl;
 use Dravencms\Components\BaseGrid\BaseGridFactory;
-use Dravencms\Locale\CurrentLocale;
+use Dravencms\Locale\CurrentLocaleResolver;
 use Dravencms\Model\Locale\Repository\LocaleRepository;
 use Dravencms\Model\Seo\Repository\TrackingRepository;
 use Kdyby\Doctrine\EntityManager;
@@ -58,20 +58,20 @@ class TrackingGrid extends BaseControl
      * @param TrackingRepository $trackingRepository
      * @param BaseGridFactory $baseGridFactory
      * @param EntityManager $entityManager
-     * @param CurrentLocale $currentLocale
+     * @param CurrentLocaleResolver $currentLocaleResolver
      */
     public function __construct(
         TrackingRepository $trackingRepository,
         BaseGridFactory $baseGridFactory,
         EntityManager $entityManager,
-        CurrentLocale $currentLocale
+        CurrentLocaleResolver $currentLocaleResolver
     )
     {
         parent::__construct();
 
         $this->baseGridFactory = $baseGridFactory;
         $this->trackingRepository = $trackingRepository;
-        $this->currentLocale = $currentLocale;
+        $this->currentLocale = $currentLocaleResolver->getCurrentLocale();
         $this->entityManager = $entityManager;
     }
 
diff --git a/src/Dravencms/AdminModule/Components/Seo/TrackingServiceGrid/TrackingServiceGrid.php b/src/Dravencms/AdminModule/Components/Seo/TrackingServiceGrid/TrackingServiceGrid.php
index 1be94be..e2e7b99 100644
--- a/src/Dravencms/AdminModule/Components/Seo/TrackingServiceGrid/TrackingServiceGrid.php
+++ b/src/Dravencms/AdminModule/Components/Seo/TrackingServiceGrid/TrackingServiceGrid.php
@@ -23,7 +23,7 @@
 
 use Dravencms\Components\BaseControl\BaseControl;
 use Dravencms\Components\BaseGrid\BaseGridFactory;
-use Dravencms\Locale\CurrentLocale;
+use Dravencms\Locale\CurrentLocaleResolver;
 use Dravencms\Model\Locale\Repository\LocaleRepository;
 use Dravencms\Model\Seo\Repository\TrackingServiceRepository;
 use Kdyby\Doctrine\EntityManager;
@@ -58,20 +58,20 @@ class TrackingServiceGrid extends BaseControl
      * @param TrackingServiceRepository $trackingServiceRepository
      * @param BaseGridFactory $baseGridFactory
      * @param EntityManager $entityManager
-     * @param CurrentLocale $currentLocale
+     * @param CurrentLocaleResolver $currentLocaleResolver
      */
     public function __construct(
         TrackingServiceRepository $trackingServiceRepository,
         BaseGridFactory $baseGridFactory,
         EntityManager $entityManager,
-        CurrentLocale $currentLocale
+        CurrentLocaleResolver $currentLocaleResolver
     )
     {
         parent::__construct();
 
         $this->baseGridFactory = $baseGridFactory;
         $this->trackingServiceRepository = $trackingServiceRepository;
-        $this->currentLocale = $currentLocale;
+        $this->currentLocale = $currentLocaleResolver->getCurrentLocale();
         $this->entityManager = $entityManager;
     }