Migrate to new dravencms/locale

Author: Salamek

src/Dravencms/AdminModule/Components/Article/ArticleGrid/ArticleGrid.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\Article\Entities\Group;
 use Dravencms\Model\Article\Repository\ArticleRepository;
 use Dravencms\Model\Locale\Repository\LocaleRepository;
@@ -46,6 +46,7 @@ class ArticleGrid extends BaseControl
     /** @var EntityManager */
     private $entityManager;
 
+    /** @var ILocale */
     private $currentLocale;
 
     /** @var Group */
@@ -62,22 +63,22 @@ class ArticleGrid extends BaseControl
      * @param ArticleRepository $articleRepository
      * @param BaseGridFactory $baseGridFactory
      * @param EntityManager $entityManager
-     * @param CurrentLocale $currentLocale
+     * @param CurrentLocaleResolver $currentLocaleResolver
      */
     public function __construct(
         Group $group,
         ArticleRepository $articleRepository,
         BaseGridFactory $baseGridFactory,
         EntityManager $entityManager,
-        CurrentLocale $currentLocale
+        CurrentLocaleResolver $currentLocaleResolver
     )
     {
         parent::__construct();
 
         $this->group = $group;
         $this->baseGridFactory = $baseGridFactory;
         $this->articleRepository = $articleRepository;
-        $this->currentLocale = $currentLocale;
+        $this->currentLocale = $currentLocaleResolver->getCurrentLocale();
         $this->entityManager = $entityManager;
     }
 

src/Dravencms/FrontModule/Components/Article/Article/Detail/Detail.php

@@ -3,7 +3,7 @@
 namespace Dravencms\FrontModule\Components\Article\Article\Detail;
 
 use Dravencms\Components\BaseControl\BaseControl;
-use Dravencms\Locale\CurrentLocale;
+use Dravencms\Locale\CurrentLocaleResolver;
 use Dravencms\Model\Article\Repository\ArticleRepository;
 use Dravencms\Model\Article\Repository\ArticleTranslationRepository;
 use Salamek\Cms\ICmsActionOption;
@@ -16,24 +16,31 @@ class Detail extends BaseControl
     /** @var ICmsActionOption */
     private $cmsActionOption;
 
-    /** @var CurrentLocale */
+    /** @var ILocale */
     private $currentLocale;
 
     /** @var ArticleTranslationRepository */
     private $articleTranslationRepository;
 
+    /**
+     * Detail constructor.
+     * @param ICmsActionOption $cmsActionOption
+     * @param ArticleRepository $articleRepository
+     * @param ArticleTranslationRepository $articleTranslationRepository
+     * @param CurrentLocaleResolver $currentLocaleResolver
+     */
     public function __construct(
         ICmsActionOption $cmsActionOption,
         ArticleRepository $articleRepository,
         ArticleTranslationRepository $articleTranslationRepository,
-        CurrentLocale $currentLocale
+        CurrentLocaleResolver $currentLocaleResolver
     )
     {
         parent::__construct();
         $this->cmsActionOption = $cmsActionOption;
         $this->articleRepository = $articleRepository;
         $this->articleTranslationRepository = $articleTranslationRepository;
-        $this->currentLocale = $currentLocale;
+        $this->currentLocale = $currentLocaleResolver->getCurrentLocale();
     }
 
     public function render()