Merge pull request #540 from Smartling/WP-906-unicode

remove unneeded slash (WP-906)

Author: vsolovei-smartling

composer.json

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

inc/Smartling/DbAl/WordpressContentEntities/PostEntityStd.php

@@ -222,7 +222,7 @@ public function set(Entity $entity): int
         $this->getLogger()->debug(sprintf(
             'Calling wp_insert_post with postArray="%s", addSlashes=%s, currentBlogId=%d',
             json_encode($array),
-            $addSlashes,
+            $addSlashes ? '1' : '0',
             $this->wordpressFunctionProxyHelper->get_current_blog_id(),
         ));
         $res = wp_insert_post($array, true);

inc/Smartling/Helpers/GutenbergBlockHelper.php

@@ -416,10 +416,10 @@ public function renderGutenbergBlock(string $name, array $attrs, array $chunks,
     {
         /* Some user content might have JSON with \u0022 to escape quotes.
         After processing XML \u0022 turns into ", which is correct for general content.
-        To properly encode the quotes in JSON again we replace " with \" */
+        To properly encode the quotes in JSON again we replace " with " */
         if ($depth === 0 && $this->isPossibleJson($attrs)) {
             array_walk_recursive($attrs, static function (&$value) {
-                $value = str_replace('"', '\"', $value);
+                $value = str_replace('"', '"', $value);
             });
         }
         $attributes = '';

readme.txt

@@ -4,7 +4,7 @@ Tags: translation, localization, localisation, translate, multilingual, smartlin
 Requires at least: 5.5
 Tested up to: 6.4.1
 Requires PHP: 8.0
-Stable tag: 3.9.7
+Stable tag: 3.9.8
 License: GPLv2 or later
 
 Translate content in WordPress quickly and seamlessly with Smartling, the industry-leading Translation Management System.
@@ -62,11 +62,14 @@ 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 ==
+= 3.9.8 =
+* Fixed extra slashes being added in Gutenberg block attributes that had quotes after translation
+
 = 3.9.7 =
-* Exclude strings that require no translation from upload
+* Excluded strings that require no translation from upload
 
 = 3.9.6 =
-* Improve ACF content detection for Gutenberg blocks, the plugin should no longer apply translation to ACF fields that don't require translation, such as `select`, `choice` and similar fields.
+* Improved ACF content detection for Gutenberg blocks, the plugin should no longer apply translation to ACF fields that don't require translation, such as `select`, `choice` and similar fields.
 
 = 3.9.5 =
 * Fixed submissions failing with "Batch is not suitable for adding files" error when uploading with related content

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:           3.9.7
+ * Version:           3.9.8
  * Author:            Smartling
  * Author URI:        https://www.smartling.com
  * License:           GPL-2.0+

tests/Smartling/Helpers/GutenbergBlockHelperTest.php

@@ -307,7 +307,12 @@ public function placeBlockDataProvider(): array
      */
     public function testRenderGutenbergBlock(string $blockName, array $attributes, array $chunks, string $expected, int $level = 0)
     {
-        self::assertEquals($expected, $this->helper->renderGutenbergBlock($blockName, $attributes, $chunks, $level));
+        $rendered = $this->helper->renderGutenbergBlock($blockName, $attributes, $chunks, $level);
+        $matches = [];
+        preg_match('~({.+}) /?-->~', $rendered, $matches);
+        self::assertEquals($expected, $rendered);
+        // Ensure json in attributes is valid
+        json_decode($matches[1], true, 512, JSON_THROW_ON_ERROR);
     }
 
     public function renderGutenbergBlockDataProvider(): array
@@ -375,7 +380,7 @@ public function renderGutenbergBlockDataProvider(): array
                 'wework-blocks/geo-location',
                 ['showList' => '[{"value":"united-states","label":"United States"}]'],
                 [],
-                '<!-- wp:wework-blocks/geo-location {"showList":"[{\\\\\\"value\\\\\\":\\\\\\"united-states\\\\\\",\\\\\\"label\\\\\\":\\\\\\"United States\\\\\\"}]"} /-->',
+                '<!-- wp:wework-blocks/geo-location {"showList":"[{\\"value\\":\\"united-states\\",\\"label\\":\\"United States\\"}]"} /-->',
             ],
             'nested attributes' => [
                 'acf/image-text-wrap',