bump version, add readme, simplify code (WP-967)

Author: vsolovei-smartling

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "smartling/wordpress-connector",
   "license": "GPL-2.0-or-later",
-  "version": "4.4.1",
+  "version": "5.0.0",
   "description": "",
   "type": "wordpress-plugin",
   "repositories": [

inc/Smartling/Models/UserTranslationRequest.php

@@ -47,7 +47,7 @@ public function isBulk(): bool
         return count($this->ids) > 0;
     }
 
-    private static function validate(array $array)
+    private static function validate(array $array): void
     {
         if (!array_key_exists('source', $array)) {
             throw new \InvalidArgumentException('Source array required');

inc/Smartling/Services/ContentRelationsDiscoveryService.php

@@ -217,14 +217,12 @@ public function createSubmissions(UserTranslationRequest $request): void
 
         $relatedIds = [];
         try {
-            foreach ($request->getRelationsOrdered() as $relations) {
-                foreach ($relations as $content) {
-                    foreach ($content as $contentType => $contentIds) {
-                        if (!array_key_exists($contentType, $relatedIds)) {
-                            $relatedIds[$contentType] = [];
-                        }
-                        $relatedIds[$contentType] = array_merge($relatedIds[$contentType], $contentIds);
+            foreach ($request->getRelationsOrdered() as $content) {
+                foreach ($content as $contentType => $contentIds) {
+                    if (!array_key_exists($contentType, $relatedIds)) {
+                        $relatedIds[$contentType] = [];
                     }
+                    $relatedIds[$contentType] = array_merge($relatedIds[$contentType], $contentIds);
                 }
             }
             foreach ($relatedIds as $contentType => $contentIds) {
@@ -568,9 +566,7 @@ public function getRelations(string $contentType, int $id, array $targetBlogIds)
         $detectedReferences = $this->normalizeReferences($detectedReferences);
         $this->getLogger()->debug('References after normalizing: ' . json_encode($detectedReferences));
 
-        $responseData = new DetectedRelations($detectedReferences);
-
-        return $responseData;
+        return new DetectedRelations($detectedReferences);
     }
 
     public function normalizeReferences(array $references): array
@@ -666,17 +662,16 @@ private function getSources(UserCloneRequest $request, int $targetBlogId): array
     {
         $sources = [];
 
-        foreach ($request->getRelationsOrdered() as $relationSet) {
-            foreach (($relationSet[$targetBlogId] ?? []) as $type => $ids) {
-                foreach ($ids as $id) {
-                    if ($id === $request->getContentId() && $type === $request->getContentType()) {
-                        $this->getLogger()->info("Related list contains reference to root content, skip adding sourceId=$id, contentType=$type to sources list");
-                    } else {
-                        $sources[] = [
-                            'id' => $id,
-                            'type' => $type,
-                        ];
-                    }
+        $relationSet = $request->getRelationsOrdered();
+        foreach (($relationSet[$targetBlogId] ?? []) as $type => $ids) {
+            foreach ($ids as $id) {
+                if ($id === $request->getContentId() && $type === $request->getContentType()) {
+                    $this->getLogger()->info("Related list contains reference to root content, skip adding sourceId=$id, contentType=$type to sources list");
+                } else {
+                    $sources[] = [
+                        'id' => $id,
+                        'type' => $type,
+                    ];
                 }
             }
         }

inc/Smartling/WP/View/ContentEditJob.php

@@ -538,7 +538,7 @@ function (i, e) {
 
                     switch ($('#cloneDepth').val()) {
                         case "1":
-                            data.relations = {1: prepareRequest(l1Relations.originalReferences)};
+                            data.relations = prepareRequest(l1Relations.originalReferences);
                             break;
                         case "2":
                             const mergedOriginal = {...l1Relations.originalReferences};
@@ -549,7 +549,7 @@ function (i, e) {
                                     mergedOriginal[type] = l2Relations.originalReferences[type];
                                 }
                             }
-                            data.relations = {1: prepareRequest(l1Relations.originalReferences), 2: prepareRequest(l2Relations.originalReferences)};
+                            data.relations = prepareRequest(mergedOriginal);
                             break;
                     }
                 }

readme.txt

@@ -4,7 +4,7 @@ Tags: translation, localization, multilingual, internationalization, smartling
 Requires at least: 5.5
 Tested up to: 6.6.2
 Requires PHP: 8.0
-Stable tag: 4.4.1
+Stable tag: 5.0.0
 License: GPLv2 or later
 
 Translate content in WordPress quickly and seamlessly with Smartling, the industry-leading Translation Management System.
@@ -62,6 +62,9 @@ Additional information on the Smartling Connector for WordPress can be found [he
 3. Track translation status within WordPress from the Submissions Board. View overall progress of submitted translation requests as well as resend updated content.
 
 == Changelog ==
+= 5.0.0 =
+* Related assets will now be processed for translation when the content is submitted from the widget, even if they were previously sent for translation
+
 = 4.4.1 =
 * Added possibility to clear the test run flag regardless of the test run status
 * Fixed test run erroneously flagging taxonomy submissions as failed

smartling-connector.php

@@ -11,7 +11,7 @@
  * Plugin Name:       Smartling Connector
  * Plugin URI:        https://www.smartling.com/products/automate/integrations/wordpress/
  * Description:       Integrate your WordPress site with Smartling to upload your content and download translations.
- * Version:           4.4.1
+ * Version:           5.0.0
  * Author:            Smartling
  * Author URI:        https://www.smartling.com
  * License:           GPL-2.0+