From: Vincent Vanwaelscappel Date: Mon, 20 Feb 2023 17:01:07 +0000 (+0100) Subject: wait #5690 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=35c93aee458bc7ad634a7284e2e9237ce8074b35;p=cubist_cms-back.git wait #5690 --- diff --git a/src/app/Magic/Models/CubistMagicTranslatableModel.php b/src/app/Magic/Models/CubistMagicTranslatableModel.php index 4fc8dc3..f0d3067 100644 --- a/src/app/Magic/Models/CubistMagicTranslatableModel.php +++ b/src/app/Magic/Models/CubistMagicTranslatableModel.php @@ -137,6 +137,10 @@ class CubistMagicTranslatableModel extends CubistMagicAbstractModel $value = $this->_migrateTranslation($key); } + if(str_starts_with($key,'t_') && !$value){ + $value=''; + } + if (null === $f) { return $value; } diff --git a/src/app/Magic/Models/Translate.php b/src/app/Magic/Models/Translate.php index d9fe5e2..e637927 100644 --- a/src/app/Magic/Models/Translate.php +++ b/src/app/Magic/Models/Translate.php @@ -71,8 +71,14 @@ class Translate extends CubistMagicTranslatableModel foreach ($toTranslate as $string) { $key = 't_' . base64_encode($string); + if(is_string($string)){ + $label=e($string); + }else{ + $label='??'; + } + $this->addField(['name' => $key, - 'label' => e($string), + 'label' => $label, 'type' => 'Textarea', 'translatable' => true, 'store_in' => 'content',