wip #3158 @1

diff --git a/src/app/Magic/Models/CubistMagicTranslatableModel.php b/src/app/Magic/Models/CubistMagicTranslatableModel.php
index 4d9740f83038699aab27feb626cf30368f8b2596..0c7ea1c747074d5062ae753e31ab23628ca24285 100644 (file)
--- a/src/app/Magic/Models/CubistMagicTranslatableModel.php
+++ b/src/app/Magic/Models/CubistMagicTranslatableModel.php
@@ -92,13 +92,15 @@ class CubistMagicTranslatableModel extends CubistMagicAbstractModel
                     //echo 'no translation for ' . $translatable . "\n";
                     continue;
                 }
-                if ($overwrite || !$item->hasTranslation($translatable, $to)) {
-                    // echo "copy translation for " . $translatable . "\n";
-                    $translated = $item->getTranslation($translatable, $from);
-                    $item->setTranslation($translatable, $to, $translated);
-                } else {
-                    // echo "no overwriting existing for " . $translatable . "\n";
+
+                $fake = in_array($translatable, $item->fakeColumns);
+                $hasTranslation = $item->hasTranslation($translatable, $to);
+                $destTranslation = $item->getTranslation($translatable, $from);
+                if (!$overwrite && $hasTranslation && $fake) {
+                    $destTranslation = array_merge($destTranslation, $item->getTranslation($translatable, $to));
                 }
+                $item->setTranslation($translatable, $to, $destTranslation);
+
             }
             $item->save();
             $i++;