wait #5690

diff --git a/src/app/Magic/Models/CubistMagicTranslatableModel.php b/src/app/Magic/Models/CubistMagicTranslatableModel.php
index 4fc8dc36cbf43b6b0988968259a2b8c8b082cb55..f0d3067be30f0c33f948a44a5a84862f9ff517db 100644 (file)
--- 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 d9fe5e2e42a9c75cf64db52a3034677052af1b9f..e63792756756061ac6b6f17e6fff5822e14fda6f 100644 (file)
--- 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',