Merge pull request #423 from AcclaroInc/release/3.2.2

Release/3.2.2

.craftplugin

@@ -1,7 +1,7 @@
 {
     "pluginName": "Translations for Craft",
     "pluginDescription": "Drive global growth with simplified translation workflows.",
-    "pluginVersion": "3.2.1",
+    "pluginVersion": "3.2.2",
     "pluginAuthorName": "Acclaro",
     "pluginVendorName": "Acclaro",
     "pluginAuthorUrl": "http://www.acclaro.com/",

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 3.2.2 - 2023-02-27
+
+### Fixed
+- An issue where delivered files failed to merge into draft ([AcclaroInc#421](https://github.com/AcclaroInc/craft-translations/issues/421))
+- An issue where log files failed to download with invalid date error.
+
 ## 3.2.1 - 2023-02-06
 
 ### Fixed

src/controllers/SettingsController.php

@@ -161,7 +161,7 @@ public function actionDownloadLogs()
             return $this->asFailure($this->getErrorMessage("Something went wrong with date"));
         }
 
-        $requestedDate = \DateTime::createFromFormat('n/j/Y', $requestedDate)->format('Y-m-d');
+        $requestedDate = \DateTime::createFromFormat('d/m/Y', $requestedDate)->format('Y-m-d');
         $errors = \DateTime::getLastErrors();
 
         if (($errors['warning_count'] + $errors['error_count']) > 0) {

src/services/fieldtranslator/NeoFieldTranslator.php

@@ -60,7 +60,7 @@ protected function parseBlockData(&$allBlockData, $blockData, $blockId=null)
         $newToParse = array();
 
         foreach ($blockData as $key => $value) {
-            if (is_numeric($key) || strpos($key, "_") !== false || strpos($key, "new", 0) !== false) {
+            if (is_numeric($key) || strpos($key, "new", 0) !== false) {
                 $newToParse[$key] = $value;
             } else {
                 $newBlockData[$key] = $value;
@@ -101,11 +101,8 @@ public function toPostArrayFromTranslationTarget(ElementTranslator $elementTrans
         foreach ($blocks as $i => $block) {
             $i = 'new' . ++$new;
 
-            // Check for old key in case an order was created before plugin update
-            $oldKey = sprintf('%s_%s', $block->fieldId, $block->canonicalId);
-
             $blockId = $field->getIsTranslatable() ? $i : $block->id;
-            $blockData = $allBlockData[$i] ?? $allBlockData[$oldKey] ?? array();
+            $blockData = $allBlockData[$i] ?? array();
 
             $post[$fieldHandle][$blockId] = array(
                 'modified' => '1',