Add Translator to SitemapPresenter to use current locale on the cache…

… key in order to generate l10n sitemap content. Fix renderData method in Builder class missing transformer parameter
locomotivemtl · Oct 25, 2023 · e3346c4 · e3346c4
1 parent ce68156
commit e3346c4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/src/Charcoal/Sitemap/Service/Builder.php b/src/Charcoal/Sitemap/Service/Builder.php
@@ -360,7 +360,7 @@ protected function renderData(ViewableInterface $obj, $data, $transformer = null
         if (is_array($data)) {
             $out = [];
             foreach ($data as $key => $content) {
-                $out[$key] = $this->renderData($obj, $content);
+                $out[$key] = $this->renderData($obj, $content, $transformer);
             }
             return $out;
         }

diff --git a/src/Charcoal/Sitemap/Service/SitemapPresenter.php b/src/Charcoal/Sitemap/Service/SitemapPresenter.php
@@ -5,6 +5,7 @@
 use ArrayAccess;
 use Charcoal\Cache\Facade\CachePoolFacade;
 use Charcoal\Factory\FactoryInterface;
+use Charcoal\Translator\TranslatorAwareTrait;
 use InvalidArgumentException;
 use Traversable;
 
@@ -20,6 +21,8 @@
  */
 class SitemapPresenter
 {
+    use TranslatorAwareTrait;
+
     /**
      * @var FactoryInterface $transformer
      */
@@ -40,10 +43,11 @@ class SitemapPresenter
      * @param string                     $getterPattern The string pattern to match string with. Must have a single
      *                                                  catch-block.
      */
-    public function __construct($transformerFactory, $cacheFacade, $getterPattern = '~{{(\w*?)}}~')
+    public function __construct($transformerFactory, $cacheFacade, $translator, $getterPattern = '~{{(\w*?)}}~')
     {
         $this->setCacheFacade($cacheFacade);
         $this->setTransformerFactory($transformerFactory);
+        $this->setTranslator($translator);
         $this->getterPattern = $getterPattern;
     }
 
@@ -59,10 +63,11 @@ public function transform($obj, $transformer = null)
         }
 
         $key = sprintf(
-            '%s_%s_%s',
+            '%s_%s_%s_%s',
             get_class($transformer),
             $obj->objType(),
-            $obj->id()
+            $obj->id(),
+            $this->translator()->getLocale(),
         );
 
         $that = $this;

diff --git a/src/Charcoal/Sitemap/ServiceProvider/SitemapServiceProvider.php b/src/Charcoal/Sitemap/ServiceProvider/SitemapServiceProvider.php
@@ -54,7 +54,8 @@ public function register(Container $container)
 
             return new SitemapPresenter(
                 $transformerFactory,
-                $container['cache/facade']
+                $container['cache/facade'],
+                $container['translator'],
             );
         };
         /**
@@ -73,12 +74,15 @@ public function register(Container $container)
                 'resolver_options' => [
                     'suffix'       => 'Transformer',
                     'replacements' => [
-                        'App/'  => 'App/Transformer/Sitemap/',
-                        'app/'  => 'app/transformer/sitemap/',
-                        'App\\' => 'App\\Transformer\\Sitemap\\',
-                        '-'         => '',
-                        '/'         => '\\',
-                        '.'         => '_'
+                        'App/Model/'    => 'App/Transformer/Sitemap/',
+                        'app/model'     => 'app/transformer/sitemap/',
+                        'App\\Model\\'  => 'App\\Transformer\\Sitemap\\',
+                        'App/'          => 'App/Transformer/Sitemap/',
+                        'app/'          => 'app/transformer/sitemap/',
+                        'App\\'         => 'App\\Transformer\\Sitemap\\',
+                        '-'             => '',
+                        '/'             => '\\',
+                        '.'             => '_'
                     ],
                 ],
             ]);