mediaが翻訳できない問題と必要ないオブジェクトの処理を修正

appleple · Nov 26, 2024 · b1f7ca2 · b1f7ca2
1 parent d089b38
commit b1f7ca2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 50 deletions.
diff --git a/src/Engine.php b/src/Engine.php
@@ -144,7 +144,7 @@ public function buildEntryData($entry, $targetField, $detail = true)
         ];
         if ($detail) {
             $item['fields'] = $this->buildFieldData($eid, $targetField);
-            $item['units'] = $this->buildUnitDate($eid);
+            $item['units'] = $this->buildUnitData($eid);
         }
         return $item;
     }
@@ -347,7 +347,7 @@ protected function buildFieldData($eid, $targetField)
      * @param int $eid
      * @return array
      */
-    protected function buildUnitDate($eid)
+    protected function buildUnitData($eid)
     {
         $item = [];
         $units = loadColumn($eid);

diff --git a/src/Import.php b/src/Import.php
@@ -129,6 +129,9 @@ protected function buildEntry(&$model, $entry)
                                 $current->setField1($new->table);
                                 break;
                             case 'media':
+                                $current->setField2($new->caption);
+                                $current->setField3($new->alt);
+                                break;
                             case 'image':
                                 $current->setField1($new->caption);
                                 $current->setField4($new->alt);
@@ -137,8 +140,7 @@ protected function buildEntry(&$model, $entry)
                                 $current->setField1($new->caption);
                                 break;
                         }
-                        $newId = $current->generateNewIdTrait();
-                        $current->setId($newId);
+                        $current->setTempId(uniqueString());
                         $model->units[$i] = $current;
                         break;
                     }

diff --git a/src/POST/GoogleTranslate/CreateEntry.php b/src/POST/GoogleTranslate/CreateEntry.php
@@ -132,29 +132,6 @@ protected function addToTranslationUnits($units, $googleTranslate)
                         $googleTranslate->addText('unit_caption_' . $i, $unit['caption']);
                         break;
                 }
-            } elseif (is_object($unit)) {
-                $type = detectUnitTypeSpecifier($unit->getType());
-                switch ($type) {
-                    case 'text':
-                        $tagType = $this->getTextUnitFormat($unit->getTag());
-                        if ($tagType === 'html') {
-                            $googleTranslate->addHtml('unit_text_' . $i, $this->newLineEscape($unit->getText()));
-                        } elseif ($tagType === 'text') {
-                            $googleTranslate->addText('unit_text_' . $i, $unit->getText());
-                        }
-                        break;
-                    case 'table':
-                        $googleTranslate->addHtml('unit_table_' . $i, $unit->getTable());
-                        break;
-                    case 'media':
-                    case 'image':
-                        $googleTranslate->addText('unit_caption_' . $i, $unit->getCaption());
-                        $googleTranslate->addText('unit_alt_' . $i, $unit->getAlt());
-                        break;
-                    case 'file':
-                        $googleTranslate->addText('unit_caption_' . $i, $unit->getCaption());
-                        break;
-                }
             }
         }
     }
@@ -189,29 +166,6 @@ protected function getTranslationUnits(&$units, $googleTranslate)
                         $unit['caption'] = $googleTranslate->getText('unit_caption_' . $i);
                         break;
                 }
-            } elseif (is_object($unit)) {
-                $type = detectUnitTypeSpecifier($unit->getType());
-                switch ($type) {
-                    case 'text':
-                        $tagType = $this->getTextUnitFormat($unit->getTag());
-                        if ($tagType === 'html') {
-                            $unit->setText($this->newLineUnEscape($googleTranslate->getHtml('unit_text_' . $i)));
-                        } elseif ($tagType === 'text') {
-                            $unit->setText($googleTranslate->getText('unit_text_' . $i));
-                        }
-                        break;
-                    case 'table':
-                        $unit->setTable($googleTranslate->getHtml('unit_table_' . $i));
-                        break;
-                    case 'media':
-                    case 'image':
-                        $unit->setCaption($googleTranslate->getText('unit_caption_' . $i));
-                        $unit->setAlt($googleTranslate->getText('unit_alt_' . $i));
-                        break;
-                    case 'file':
-                        $unit->setCaption($googleTranslate->getText('unit_caption_' . $i));
-                        break;
-                }
             }
         }
     }