Merge pull request #61 from dmolineus/fix/system-columns

Id, language pid and language column not translated
terminal42 · Jan 20, 2020 · a115793 · a115793
2 parents 4891d7e + bbee4ad
commit a115793
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Model/Multilingual.php b/src/Model/Multilingual.php
@@ -57,15 +57,15 @@ public function getAlias($language, $aliasColumnName = 'alias')
         }
 
         // Try to load the translated model
-        $translatedModel = static::findByPk($this->id, ['language' => $language]);
+        $translatedModel = static::findByPk($this->getLanguageId(), ['language' => $language]);
 
         if (null === $translatedModel) {
             // Get fallback
             if ($language === $fallbackLang) {
                 return $this->{$aliasColumnName};
             }
 
-            $fallbackModel = static::findByPk($this->id, ['language' => $fallbackLang]);
+            $fallbackModel = static::findByPk($this->getLanguageId(), ['language' => $fallbackLang]);
 
             return $fallbackModel->{$aliasColumnName};
         }

diff --git a/src/QueryBuilder/MultilingualQueryBuilder.php b/src/QueryBuilder/MultilingualQueryBuilder.php
@@ -12,6 +12,7 @@
 namespace Terminal42\DcMultilingualBundle\QueryBuilder;
 
 use Doctrine\DBAL\Query\QueryBuilder;
+use function array_intersect;
 
 class MultilingualQueryBuilder implements MultilingualQueryBuilderInterface
 {
@@ -107,8 +108,14 @@ public function buildQueryBuilderForFind($language)
     {
         $this->qb->resetQueryParts();
 
+        // Always translate system columns
+        $systemColumns = ['id', $this->langColumnName, $this->pidColumnName];
+        foreach ($systemColumns as $field) {
+            $this->qb->addSelect("IFNULL(translation.$field, {$this->table}.$field) AS $field");
+        }
+
         // Regular fields
-        foreach (array_diff($this->regularFields, $this->translatableFields) as $field) {
+        foreach (array_diff($this->regularFields, $this->translatableFields, $systemColumns) as $field) {
             $this->qb->addSelect("{$this->table}.$field");
         }