Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Classes/ContentRepository/NodeTranslationService.php
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ public function translateNode(NodeInterface $sourceNode, NodeInterface $targetNo
if (is_array($propertyValue)) {
$targetValue = $targetNode->getProperty($propertyName);
if ($connector = $translatableProperties->getTranslationObjectConnector($propertyName)) {
if (is_object($targetValue)) {
if (is_object($targetValue) || is_array($targetValue)) {
$targetValue = $connector->applyTranslations($targetValue, $propertyValue);
}
}
Expand Down
11 changes: 6 additions & 5 deletions Classes/Domain/TranslatableProperty/TranslatablePropertyName.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace Sitegeist\LostInTranslation\Domain\TranslatableProperty;

use Sitegeist\LostInTranslation\Domain\TranslationConnectorInterface;
use Sitegeist\LostInTranslation\Domain\TranslationArrayConnectorInterface;

class TranslatablePropertyName
{
Expand All @@ -14,15 +15,15 @@ class TranslatablePropertyName
protected $name;

/**
* @var TranslationConnectorInterface<object>|null
* @var TranslationConnectorInterface<object>|TranslationArrayConnectorInterface<array<string,mixed>>|null
*/
protected $translationConnector;

/**
* @param string $name
* @param TranslationConnectorInterface<object>|null $translationConnector
* @param TranslationConnectorInterface<object>|TranslationArrayConnectorInterface<array<string,mixed>>|null $translationConnector
*/
public function __construct(string $name, ?TranslationConnectorInterface $translationConnector = null)
public function __construct(string $name, TranslationConnectorInterface | TranslationArrayConnectorInterface | null $translationConnector = null)
{
$this->name = $name;
$this->translationConnector = $translationConnector;
Expand All @@ -34,9 +35,9 @@ public function getName(): string
}

/**
* @return TranslationConnectorInterface<object>|null
* @return TranslationConnectorInterface<object>|TranslationArrayConnectorInterface<array<string,mixed>>|null
*/
public function getTranslationConnector(): ?TranslationConnectorInterface
public function getTranslationConnector(): TranslationConnectorInterface | TranslationArrayConnectorInterface | null
{
return $this->translationConnector;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace Sitegeist\LostInTranslation\Domain\TranslatableProperty;

use Sitegeist\LostInTranslation\Domain\TranslationConnectorInterface;
use Sitegeist\LostInTranslation\Domain\TranslationArrayConnectorInterface;

/**
* @implements \IteratorAggregate<int, TranslatablePropertyName>
Expand Down Expand Up @@ -32,9 +33,9 @@ public function isTranslatable(string $propertyName): bool

/**
* @param string $propertyName
* @return TranslationConnectorInterface<object>|null
* @return TranslationConnectorInterface<object>|TranslationArrayConnectorInterface<array<string,mixed>>|null
*/
public function getTranslationObjectConnector(string $propertyName): ?TranslationConnectorInterface
public function getTranslationObjectConnector(string $propertyName): TranslationConnectorInterface | TranslationArrayConnectorInterface | null
{
foreach ($this->translatableProperties as $translatableProperty) {
if ($translatableProperty->getName() == $propertyName) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use Neos\ContentRepository\Domain\Model\NodeType;
use Neos\Flow\ObjectManagement\ObjectManagerInterface;
use Sitegeist\LostInTranslation\Domain\TranslationConnectorInterface;
use Sitegeist\LostInTranslation\Domain\TranslationArrayConnectorInterface;

class TranslatablePropertyNamesFactory
{
Expand Down Expand Up @@ -60,6 +61,8 @@ public function createForNodeType(NodeType $nodeType): TranslatablePropertyNames
?? false;
$translationConnector = $this->translationConnectors[$type]
?? null;
$translationConnectorFromPropertyDefinition = $propertyDefinition['options']['translationConnector']
?? null;

if ($automaticTranslationIsEnabled === false) {
continue;
Expand All @@ -73,6 +76,14 @@ public function createForNodeType(NodeType $nodeType): TranslatablePropertyNames
$translationConnectorInstance = $this->objectManager->get($translationConnector);
assert($translationConnectorInstance instanceof TranslationConnectorInterface);
$translateProperties[] = new TranslatablePropertyName($propertyName, $translationConnectorInstance);
} elseif ($translationConnectorFromPropertyDefinition && $automaticTranslationIsEnabled) {
$translationConnectorInstance = $this->objectManager->get($translationConnectorFromPropertyDefinition);
if ($type === "array") {
assert($translationConnectorInstance instanceof TranslationArrayConnectorInterface);
} else {
assert($translationConnectorInstance instanceof TranslationConnectorInterface);
}
$translateProperties[] = new TranslatablePropertyName($propertyName, $translationConnectorInstance);
}
}
$this->firstLevelCache[$nodeType->getName()] = new TranslatablePropertyNames(...$translateProperties);
Expand Down
24 changes: 24 additions & 0 deletions Classes/Domain/TranslationArrayConnectorInterface.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php

declare(strict_types=1);

namespace Sitegeist\LostInTranslation\Domain;

/**
* @template TArray of array
*/
interface TranslationArrayConnectorInterface
{
/**
* @param TArray $array
* @return array<non-empty-string, string>
*/
public function extractTranslations(array $array): array;

/**
* @param TArray $array
* @param array<non-empty-string, string> $translations
* @return TArray
*/
public function applyTranslations(array $array, array $translations): array;
}