From 356db9ac1a65d96a5526b9aabba87e612356ceeb Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Fri, 17 Jun 2022 13:11:21 +0200
Subject: [PATCH 1/2] Add server side registration to fix translation

---
 src/wp-includes/blocks/comments-query-loop.php | 16 ++++++++++++++++
 src/wp-includes/blocks/index.php               |  1 +
 2 files changed, 17 insertions(+)
 create mode 100644 src/wp-includes/blocks/comments-query-loop.php

diff --git a/src/wp-includes/blocks/comments-query-loop.php b/src/wp-includes/blocks/comments-query-loop.php
new file mode 100644
index 0000000000000..8e0ff26dc3283
--- /dev/null
+++ b/src/wp-includes/blocks/comments-query-loop.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Server-side rendering of the `core/comments-query-loop` block.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Registers the `core/comments-query-loop` block on the server.
+ */
+function register_block_core_comments_query_loop() {
+	register_block_type_from_metadata(
+		__DIR__ . '/comments-query-loop'
+	);
+}
+add_action( 'init', 'register_block_core_comments_query_loop' );
\ No newline at end of file
diff --git a/src/wp-includes/blocks/index.php b/src/wp-includes/blocks/index.php
index 91f00e42cbe3e..6247ae9028f52 100644
--- a/src/wp-includes/blocks/index.php
+++ b/src/wp-includes/blocks/index.php
@@ -21,6 +21,7 @@
 require ABSPATH . WPINC . '/blocks/comments-pagination-numbers.php';
 require ABSPATH . WPINC . '/blocks/comments-pagination-previous.php';
 require ABSPATH . WPINC . '/blocks/comments-pagination.php';
+require ABSPATH . WPINC . '/blocks/comments-query-loop.php';
 require ABSPATH . WPINC . '/blocks/comments-title.php';
 require ABSPATH . WPINC . '/blocks/cover.php';
 require ABSPATH . WPINC . '/blocks/file.php';

From 0231dc191b4009deb47233a572ac896f2d3406d4 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Fri, 17 Jun 2022 13:54:20 +0200
Subject: [PATCH 2/2] Add translation comment on file

---
 src/wp-includes/blocks/comments-query-loop.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/wp-includes/blocks/comments-query-loop.php b/src/wp-includes/blocks/comments-query-loop.php
index 8e0ff26dc3283..2128ffba358a8 100644
--- a/src/wp-includes/blocks/comments-query-loop.php
+++ b/src/wp-includes/blocks/comments-query-loop.php
@@ -7,6 +7,8 @@
 
 /**
  * Registers the `core/comments-query-loop` block on the server.
+ * We need this file in order to have the title and description for the block translations.
+ * More info in the issue: https://github.com/WordPress/gutenberg/issues/41292
  */
 function register_block_core_comments_query_loop() {
 	register_block_type_from_metadata(