From 097141ea5f2518371fdcc863f12deb83adfcb1ae Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 22 Oct 2019 18:07:14 +0200 Subject: [PATCH] wip #3158 @1 --- .../Magic/Models/CubistMagicTranslatableModel.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/app/Magic/Models/CubistMagicTranslatableModel.php b/src/app/Magic/Models/CubistMagicTranslatableModel.php index 4d9740f..0c7ea1c 100644 --- 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++; -- 2.39.5