Changeset 2711564

Timestamp:

04/19/2022 12:50:49 PM (4 years ago)

Author:

Supertext

Message:

Sync with GitHub

Location:

polylang-supertext/trunk

Files:

• plugin.php (modified) (1 diff)
• readme.txt (modified) (1 diff)
• src/Supertext/Api/WriteBack.php (modified) (1 diff)
• src/Supertext/Backend/CallbackHandler.php (modified) (1 diff)
• src/Supertext/TextAccessors/PostTextAccessor.php (modified) (3 diffs)

polylang-supertext/trunk/plugin.php

@@ -7 +7 @@
 Domain Path: /resources/languages
 Author: Supertext AG
-Version: 4.09
+Version: 4.11
 Author URI: http://www.supertext.ch
 License: GPLv2 or later
 */
 
-define('SUPERTEXT_PLUGIN_VERSION', '4.09');
+define('SUPERTEXT_PLUGIN_VERSION', '4.11');
 define('SUPERTEXT_PLUGIN_REVISION', 46);
 define('SUPERTEXT_BASE_PATH', __DIR__);

polylang-supertext/trunk/readme.txt

@@ -110 +110 @@
 == Changelog ==
 
+= 4.11 =
+* Skip checking for translated post IDs for proofreading orders
+
+= 4.10 =
+* Use Wordpress standard functions to serialize Gutenberg blocks.
+
 = 4.09 =
 * Add basic support for ACF Gutenberg blocks that contain text in the data object.

polylang-supertext/trunk/src/Supertext/Api/WriteBack.php

@@ -58 +58 @@
   {
     $sourcePostIds = $this->getSourcePostIds();
+    $orderType = $this->getOrderType();
 
     $referenceData = hex2bin(Constant::REFERENCE_BITMASK);
     foreach ($sourcePostIds as $sourcePostId) {
-      $targetPostId = $this->library->getMultilang()->getPostInLanguage($sourcePostId, $this->getTargetLanguageCode());
+      if('translation' == $orderType) {
+        $targetPostId = $this->library->getMultilang()->getPostInLanguage($sourcePostId, $this->getTargetLanguageCode());
+      } else {
+        $targetPostId = $sourcePostId;
+      }
       $writeBackMeta = $this->getWriteBackMeta($targetPostId);
       $referenceHash = $writeBackMeta->getReferenceHash();

polylang-supertext/trunk/src/Supertext/Backend/CallbackHandler.php

@@ -102 +102 @@
     $errors = array();
     $contentData = $writeBack->getContentData();
+    $orderType = $writeBack->getOrderType();
 
     foreach ($writeBack->getSourcePostIds() as $sourcePostId) {
-      $targetPostId = $this->library->getMultilang()->getPostInLanguage($sourcePostId, $writeBack->getTargetLanguageCode());
+      if('translation' == $orderType) {
+        $targetPostId = $this->library->getMultilang()->getPostInLanguage($sourcePostId, $writeBack->getTargetLanguageCode());
+      } else {
+        $targetPostId = $sourcePostId;
+      }
 
       if ($targetPostId == null) {

polylang-supertext/trunk/src/Supertext/TextAccessors/PostTextAccessor.php

@@ -122 +122 @@
 
       if (isset($texts['post_content_block_attributes'])) {
-        $decodedContent = $this->setTranslatableBlockAttributes($texts['post_content_block_attributes'], parse_blocks($decodedContent), $decodedContent);
-      }
-
+        $newBlocks = $this->setTranslatableBlockAttributes($texts['post_content_block_attributes'], parse_blocks($decodedContent));
+        $decodedContent = serialize_blocks($newBlocks);
+      }
       $post->post_content = $this->textProcessor->replaceShortcodeNodes($decodedContent);
     }
@@ -180 +180 @@
       }
 
-      $blockAttributesTexts[$key] = $value;
+      $blockAttributesTexts[$key] = $this->textProcessor->replaceShortcodes($value);
     }
 
@@ -186 +186 @@
   }
 
-  private function setTranslatableBlockAttributes($blockAttributes, $blocks, $content)
-  {
-    $newContent = $content;
+  private function setTranslatableBlockAttributes($blockAttributes, $blocks)
+  {
+    $newBlocks = array();
 
     foreach ($blocks as $index => $block) {
       if (!isset($blockAttributes[$index])) {
-        continue;
-      }
-
-      $blockName = str_replace('/', '\/', str_replace('core/', '', $block['blockName']));
+        array_push($newBlocks, $block);
+        continue;
+      }
 
       if (isset($blockAttributes[$index]['inner-blocks'])) {
-        $newContent = $this->setTranslatableBlockAttributes($blockAttributes[$index]['inner-blocks'], $block['innerBlocks'], $newContent);
+        $block['innerBlocks'] = $this->setTranslatableBlockAttributes($blockAttributes[$index]['inner-blocks'], $block['innerBlocks']);
       }
 
       foreach ($blockAttributes[$index]['attrs'] as $key => $value) {
-        $oldValue = $block['attrs'][$key];
-        $regex = "/(<!--\s*wp:$blockName\s*{.*\"$key\"\s*:\s*)\"$oldValue\"/";
-        $newContent = preg_replace($regex, "$1\"$value\"", $newContent);
-      }
-    }
-
-    return $newContent;
+        $block['attrs'][$key] = $this->textProcessor->replaceShortcodeNodes($value);
+      }
+
+      array_push($newBlocks, $block);
+    }
+
+    return $newBlocks;
   }
 }