diff -u b/core/modules/node/migration_templates/d7_node_translation.yml b/core/modules/node/migration_templates/d7_node.yml --- b/core/modules/node/migration_templates/d7_node_translation.yml +++ b/core/modules/node/migration_templates/d7_node.yml @@ -1,14 +1,16 @@ -id: d7_node_translation -label: Node translations +id: d7_node +label: Nodes migration_tags: - Drupal 7 deriver: Drupal\node\Plugin\migrate\D7NodeDeriver source: plugin: d7_node - translations: true process: + # In D7, nodes always have a tnid, but it's zero for untranslated nodes. + # We normalize it to equal the nid in that case. + # @see \Drupal\node\Plugin\migrate\source\d7\Node::prepareRow(). nid: tnid - type: type + vid: vid langcode: plugin: default_value source: language @@ -28,9 +30,6 @@ - translations: true migration_dependencies: required: - d7_user - d7_node_type - - language optional: - d7_field_instance -provider: migrate_drupal only in patch2: unchanged: --- a/core/modules/field/migration_templates/d7_field.yml +++ b/core/modules/field/migration_templates/d7_field.yml @@ -34,7 +34,7 @@ process: phone: telephone text_long: text_long text_with_summary: text_with_summary - translatable: translatable + translatable: 'constants/status' cardinality: cardinality settings: plugin: d7_field_settings only in patch2: unchanged: --- a/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php +++ b/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php @@ -50,7 +50,7 @@ protected function getEntityCounts() { 'image_style' => 6, 'language_content_settings' => 2, 'migration' => 73, - 'node' => 3, + 'node' => 2, 'node_type' => 6, 'rdf_mapping' => 5, 'search_page' => 2,