From 514ac02973e0ca215cbad351bc1cf36f6d4fe0ea Mon Sep 17 00:00:00 2001
From: Karol Manijak <20098064+kmanijak@users.noreply.github.com>
Date: Wed, 8 Nov 2023 12:13:38 +0100
Subject: [PATCH 1/5] Create Related Products pattern reused in the Single
 Product template

That's needed in order to make the Related Products string translatable
---
 patterns/related-products.php                 | 39 +++++++++++++++++++
 .../templates/blockified/single-product.html  | 22 +----------
 2 files changed, 40 insertions(+), 21 deletions(-)
 create mode 100644 patterns/related-products.php

diff --git a/patterns/related-products.php b/patterns/related-products.php
new file mode 100644
index 00000000000..6203eceac0f
--- /dev/null
+++ b/patterns/related-products.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Title: Related Products
+ * Slug: woocommerce-blocks/related-products
+ * Categories: WooCommerce
+ * Inserter: false
+ */
+?>
+
+<!-- wp:woocommerce/related-products {"align":"wide"} -->
+<div class="wp-block-woocommerce-related-products alignwide">
+		<!-- wp:query {"queryId":0,"query":{"perPage":5,"pages":0,"offset":0,"postType":"product","order":"asc","orderBy":"title","author":"","search":"","exclude":[],"sticky":"","inherit":false},"displayLayout":{"type":"flex","columns":5},"namespace":"woocommerce/related-products","lock":{"remove":true,"move":true}} -->
+		<div class="wp-block-query">
+			<!-- wp:heading -->
+			<h2 class="wp-block-heading">
+				<?php
+					echo sprintf(
+						esc_html__(
+							'Related Products',
+							'woo-gutenberg-products-block'
+						)
+					);
+					?>
+			</h2>
+			<!-- /wp:heading -->
+
+			<!-- wp:post-template {"className":"products-block-post-template","__woocommerceNamespace":"woocommerce/product-query/product-template"} -->
+			<!-- wp:woocommerce/product-image {"isDescendentOfQueryLoop":true} /-->
+
+			<!-- wp:post-title {"textAlign":"center","level":3,"fontSize":"medium","__woocommerceNamespace":"woocommerce/product-query/product-title"} /-->
+
+			<!-- wp:woocommerce/product-price {"isDescendentOfQueryLoop":true,"textAlign":"center","fontSize":"small","style":{"spacing":{"margin":{"bottom":"1rem"}}}} /-->
+
+			<!-- wp:woocommerce/product-button {"isDescendentOfQueryLoop":true,"textAlign":"center","fontSize":"small","style":{"spacing":{"margin":{"bottom":"1rem"}}}} /-->
+			<!-- /wp:post-template -->
+		</div>
+		<!-- /wp:query -->
+	</div>
+	<!-- /wp:woocommerce/related-products -->
diff --git a/templates/templates/blockified/single-product.html b/templates/templates/blockified/single-product.html
index 8e21dcd2097..a9130ed9195 100644
--- a/templates/templates/blockified/single-product.html
+++ b/templates/templates/blockified/single-product.html
@@ -45,27 +45,7 @@
 
 	<!-- wp:woocommerce/product-details {"align":"wide"} /-->
 
-	<!-- wp:woocommerce/related-products {"align":"wide"} -->
-	<div class="wp-block-woocommerce-related-products alignwide">
-		<!-- wp:query {"queryId":0,"query":{"perPage":5,"pages":0,"offset":0,"postType":"product","order":"asc","orderBy":"title","author":"","search":"","exclude":[],"sticky":"","inherit":false},"displayLayout":{"type":"flex","columns":5},"namespace":"woocommerce/related-products","lock":{"remove":true,"move":true}} -->
-		<div class="wp-block-query">
-			<!-- wp:heading -->
-			<h2 class="wp-block-heading">Related products</h2>
-			<!-- /wp:heading -->
-
-			<!-- wp:post-template {"className":"products-block-post-template","__woocommerceNamespace":"woocommerce/product-query/product-template"} -->
-			<!-- wp:woocommerce/product-image {"isDescendentOfQueryLoop":true} /-->
-
-			<!-- wp:post-title {"textAlign":"center","level":3,"fontSize":"medium","__woocommerceNamespace":"woocommerce/product-query/product-title"} /-->
-
-			<!-- wp:woocommerce/product-price {"isDescendentOfQueryLoop":true,"textAlign":"center","fontSize":"small","style":{"spacing":{"margin":{"bottom":"1rem"}}}} /-->
-
-			<!-- wp:woocommerce/product-button {"isDescendentOfQueryLoop":true,"textAlign":"center","fontSize":"small","style":{"spacing":{"margin":{"bottom":"1rem"}}}} /-->
-			<!-- /wp:post-template -->
-		</div>
-		<!-- /wp:query -->
-	</div>
-	<!-- /wp:woocommerce/related-products -->
+	<!-- wp:pattern {"slug":"woocommerce/related-products"} /-->
 </div>
 <!-- /wp:group -->
 

From 6013022f133166dd87987becc1a34b3c1e903383 Mon Sep 17 00:00:00 2001
From: Karol Manijak <20098064+kmanijak@users.noreply.github.com>
Date: Wed, 8 Nov 2023 12:47:13 +0100
Subject: [PATCH 2/5] Add margin to Related Products heading

---
 patterns/related-products.php                      | 4 ++--
 templates/templates/blockified/single-product.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/patterns/related-products.php b/patterns/related-products.php
index 6203eceac0f..585ced7d4b3 100644
--- a/patterns/related-products.php
+++ b/patterns/related-products.php
@@ -11,8 +11,8 @@
 <div class="wp-block-woocommerce-related-products alignwide">
 		<!-- wp:query {"queryId":0,"query":{"perPage":5,"pages":0,"offset":0,"postType":"product","order":"asc","orderBy":"title","author":"","search":"","exclude":[],"sticky":"","inherit":false},"displayLayout":{"type":"flex","columns":5},"namespace":"woocommerce/related-products","lock":{"remove":true,"move":true}} -->
 		<div class="wp-block-query">
-			<!-- wp:heading -->
-			<h2 class="wp-block-heading">
+			<!-- wp:heading {"style":{"spacing":{"margin":{"top":"var:preset|spacing|30","bottom":"var:preset|spacing|30"}}}} -->
+			<h2 class="wp-block-heading" style="margin-top:var(--wp--preset--spacing--30);margin-bottom:var(--wp--preset--spacing--30)">
 				<?php
 					echo sprintf(
 						esc_html__(
diff --git a/templates/templates/blockified/single-product.html b/templates/templates/blockified/single-product.html
index a9130ed9195..54d5211daa3 100644
--- a/templates/templates/blockified/single-product.html
+++ b/templates/templates/blockified/single-product.html
@@ -45,7 +45,7 @@
 
 	<!-- wp:woocommerce/product-details {"align":"wide"} /-->
 
-	<!-- wp:pattern {"slug":"woocommerce/related-products"} /-->
+	<!-- wp:pattern {"slug":"woocommerce-blocks/related-products"} /-->
 </div>
 <!-- /wp:group -->
 

From 85f0ff162a439885b67cab3eb950346a694a5ec7 Mon Sep 17 00:00:00 2001
From: Karol Manijak <20098064+kmanijak@users.noreply.github.com>
Date: Wed, 8 Nov 2023 12:55:46 +0100
Subject: [PATCH 3/5] Add margin to Related Products transformed from classic
 template

---
 assets/js/blocks/product-query/variations/related-products.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/js/blocks/product-query/variations/related-products.tsx b/assets/js/blocks/product-query/variations/related-products.tsx
index f36fd8bc25d..ac7803ead49 100644
--- a/assets/js/blocks/product-query/variations/related-products.tsx
+++ b/assets/js/blocks/product-query/variations/related-products.tsx
@@ -57,6 +57,7 @@ export const INNER_BLOCKS_TEMPLATE: InnerBlockTemplate[] = [
 		{
 			level: 2,
 			content: __( 'Related products', 'woo-gutenberg-products-block' ),
+			style: { spacing: { margin: { top: '1rem', bottom: '1rem' } } },
 		},
 	],
 	[

From 290d443b9e71983442aa046564d2b6adbeca90a9 Mon Sep 17 00:00:00 2001
From: Karol Manijak <20098064+kmanijak@users.noreply.github.com>
Date: Wed, 8 Nov 2023 13:09:01 +0100
Subject: [PATCH 4/5] Simplify the translation

---
 patterns/related-products.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/patterns/related-products.php b/patterns/related-products.php
index 585ced7d4b3..fe9f7c34891 100644
--- a/patterns/related-products.php
+++ b/patterns/related-products.php
@@ -14,12 +14,10 @@
 			<!-- wp:heading {"style":{"spacing":{"margin":{"top":"var:preset|spacing|30","bottom":"var:preset|spacing|30"}}}} -->
 			<h2 class="wp-block-heading" style="margin-top:var(--wp--preset--spacing--30);margin-bottom:var(--wp--preset--spacing--30)">
 				<?php
-					echo sprintf(
-						esc_html__(
-							'Related Products',
-							'woo-gutenberg-products-block'
-						)
-					);
+					esc_html__(
+						'Related Products',
+						'woo-gutenberg-products-block'
+					)
 					?>
 			</h2>
 			<!-- /wp:heading -->

From 9655aea4092ff984cb948073623f2ab9507950c4 Mon Sep 17 00:00:00 2001
From: Karol Manijak <20098064+kmanijak@users.noreply.github.com>
Date: Wed, 8 Nov 2023 13:23:06 +0100
Subject: [PATCH 5/5] Change string capitalization so it's the same as the
 other one and can be transklated

---
 patterns/related-products.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/patterns/related-products.php b/patterns/related-products.php
index fe9f7c34891..f695dcdbbf8 100644
--- a/patterns/related-products.php
+++ b/patterns/related-products.php
@@ -14,8 +14,8 @@
 			<!-- wp:heading {"style":{"spacing":{"margin":{"top":"var:preset|spacing|30","bottom":"var:preset|spacing|30"}}}} -->
 			<h2 class="wp-block-heading" style="margin-top:var(--wp--preset--spacing--30);margin-bottom:var(--wp--preset--spacing--30)">
 				<?php
-					esc_html__(
-						'Related Products',
+					echo esc_html__(
+						'Related products',
 						'woo-gutenberg-products-block'
 					)
 					?>