diff -u b/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6TestBase.php b/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6TestBase.php --- b/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6TestBase.php +++ b/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6TestBase.php @@ -105,10 +105,12 @@ if (in_array('translations', $include)) { $this->executeMigrations(['d6_node_translation']); - $this->executeMigrations(['d6_node_revision_translation']); } if (in_array('revisions', $include)) { $this->executeMigrations(['d6_node_revision']); + if (in_array('translations', $include)) { + $this->executeMigrations(['d6_node_revision_translation']); + } } } diff -u b/core/modules/node/migrations/d6_node_revision.yml b/core/modules/content_translation/migrations/d6_node_revision_translation.yml --- b/core/modules/node/migrations/d6_node_revision.yml +++ b/core/modules/content_translation/migrations/d6_node_revision_translation.yml @@ -1,18 +1,20 @@ -id: d6_node_revision -label: Node revisions -audit: true +id: d6_node_revision_translation +label: Node revision translations migration_tags: - Drupal 6 + - translation - Content + - Multilingual deriver: Drupal\node\Plugin\migrate\D6NodeDeriver source: plugin: d6_node_revision + translations: true constants: revision_translation_affected: true process: # If you are using this file to build a custom migration consider removing - # the nid and vid fields to allow incremental migrations. - nid: nid + # the nid field to allow incremental migrations. + nid: tnid vid: vid langcode: plugin: default_value @@ -37,9 +39,9 @@ + content_translation_source: source_langcode revision_translation_affected: constants/revision_translation_affected -# unmapped d6 fields. -# tnid -# translate -# moderate -# comment - destination: plugin: entity_revision:node + translations: true + destination_module: content_translation +migration_dependencies: + required: + - d6_node_translation diff -u b/core/modules/node/migrations/d7_node_revision.yml b/core/modules/content_translation/migrations/d7_node_revision_translation.yml --- b/core/modules/node/migrations/d7_node_revision.yml +++ b/core/modules/content_translation/migrations/d7_node_revision_translation.yml @@ -1,18 +1,18 @@ -id: d7_node_revision -label: Node revisions -audit: true +id: d7_node_revision_translation +label: Node revision translations migration_tags: - Drupal 7 + - translation - Content + - Multilingual deriver: Drupal\node\Plugin\migrate\D7NodeDeriver source: plugin: d7_node_revision - constants: - revision_translation_affected: true + translations: true process: # If you are using this file to build a custom migration consider removing - # the nid and vid fields to allow incremental migrations. - nid: nid + # the nid field to allow incremental migrations. + nid: tnid vid: vid langcode: plugin: default_value @@ -31,6 +31,10 @@ - revision_translation_affected: constants/revision_translation_affected + content_translation_source: source_langcode destination: plugin: entity_revision:node + translations: true + content_translation_update_definitions: + - node + destination_module: content_translation migration_dependencies: required: - - d7_node + - d7_node_translation only in patch2: unchanged: --- a/core/modules/file/migrations/d6_upload.yml +++ b/core/modules/file/migrations/d6_upload.yml @@ -7,7 +7,6 @@ source: plugin: d6_upload process: nid: nid - vid: vid langcode: plugin: user_langcode source: language only in patch2: unchanged: --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php @@ -68,8 +68,8 @@ protected function getEntityCounts() { 'contact_message' => 0, 'configurable_language' => 5, 'editor' => 2, - 'field_config' => 92, - 'field_storage_config' => 66, + 'field_config' => 93, + 'field_storage_config' => 67, 'file' => 7, 'filter_format' => 7, 'image_style' => 5,