diff --git a/core/modules/comment/src/CommentStorage.php b/core/modules/comment/src/CommentStorage.php index defb849..945ff9d 100644 --- a/core/modules/comment/src/CommentStorage.php +++ b/core/modules/comment/src/CommentStorage.php @@ -188,7 +188,9 @@ public function getNewCommentPageNumber($total_comments, $new_comments, ContentE $count = $this->database->query('SELECT COUNT(*) FROM {comment_field_data} WHERE entity_id = :entity_id AND entity_type = :entity_type AND field_name = :field_name - AND status = :status AND SUBSTRING(thread, 1, (LENGTH(thread) - 1)) < :thread', array( + AND status = :status + AND SUBSTRING(thread, 1, (LENGTH(thread) - 1)) < :thread + AND default_langcode = 1', array( ':status' => CommentInterface::PUBLISHED, ':entity_id' => $entity->id(), ':field_name' => $field_name, diff --git a/core/modules/comment/src/Entity/Comment.php b/core/modules/comment/src/Entity/Comment.php index 46ffe6b..fb9d6a1 100644 --- a/core/modules/comment/src/Entity/Comment.php +++ b/core/modules/comment/src/Entity/Comment.php @@ -282,7 +282,6 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) { $fields['thread'] = FieldDefinition::create('string') ->setLabel(t('Thread place')) ->setDescription(t("The alphadecimal representation of the comment's place in a thread, consisting of a base 36 string prefixed by an integer indicating its length.")) - ->setTranslatable(TRUE) ->setSetting('max_length', 255); $fields['entity_type'] = FieldDefinition::create('string') diff --git a/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php b/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php index d0c3d19..e72aa47 100644 --- a/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php +++ b/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php @@ -78,7 +78,6 @@ function testSettingsUI() { 'settings[comment][comment_article][fields][name]' => FALSE, 'settings[comment][comment_article][fields][status]' => FALSE, 'settings[comment][comment_article][fields][subject]' => FALSE, - 'settings[comment][comment_article][fields][thread]' => FALSE, 'settings[comment][comment_article][fields][uid]' => FALSE, ); $this->assertSettings('comment', 'comment_article', FALSE, $edit);